Move Views Page Info UI code to its own folder.
Includes the following changes:
- Forks OWNERS file.
- Updates the COMPONENT in both OWNERS files:
- website_settings: UI>Browser>Permissions>Prompts
- page_info: UI>Browser>Bubbles>PageInfo
- Automatically updates filenames across the project using
`tools/git/mass-rename.py`
Followup work that is NOT part of this change:
- Add lgarron@ as an owner (crbug.com/661797)
- Move permission prompt UI code into a permission_bubble folder
(crbug.com/700581)
- Rename classes and corresponding leaf file names (crbug.com/571506)
- Functional cleanup changes (crbug.com/571533)
BUG=661796
TBR=jochen@chromium.org
Review-Url: https://codereview.chromium.org/2744933002
Cr-Commit-Position: refs/heads/master@{#456974}
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index b886345a..e4348e5 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1501,6 +1501,16 @@
"views/login_view.h",
"views/new_back_shortcut_bubble.cc",
"views/new_back_shortcut_bubble.h",
+ "views/page_info/chosen_object_row.cc",
+ "views/page_info/chosen_object_row.h",
+ "views/page_info/chosen_object_row_observer.h",
+ "views/page_info/non_accessible_image_view.cc",
+ "views/page_info/non_accessible_image_view.h",
+ "views/page_info/permission_selector_row.cc",
+ "views/page_info/permission_selector_row.h",
+ "views/page_info/permission_selector_row_observer.h",
+ "views/page_info/website_settings_popup_view.cc",
+ "views/page_info/website_settings_popup_view.h",
"views/payments/credit_card_editor_view_controller.cc",
"views/payments/credit_card_editor_view_controller.h",
"views/payments/editor_view_controller.cc",
@@ -1547,18 +1557,8 @@
"views/toolbar/toolbar_actions_bar_bubble_views.h",
"views/update_recommended_message_box.cc",
"views/update_recommended_message_box.h",
- "views/website_settings/chosen_object_row.cc",
- "views/website_settings/chosen_object_row.h",
- "views/website_settings/chosen_object_row_observer.h",
- "views/website_settings/non_accessible_image_view.cc",
- "views/website_settings/non_accessible_image_view.h",
"views/website_settings/permission_prompt_impl.cc",
"views/website_settings/permission_prompt_impl.h",
- "views/website_settings/permission_selector_row.cc",
- "views/website_settings/permission_selector_row.h",
- "views/website_settings/permission_selector_row_observer.h",
- "views/website_settings/website_settings_popup_view.cc",
- "views/website_settings/website_settings_popup_view.h",
]
deps += [
"//chrome/browser/ui/views",
diff --git a/chrome/browser/ui/views/browser_dialogs_views_mac.cc b/chrome/browser/ui/views/browser_dialogs_views_mac.cc
index 984f41ce..702aa69 100644
--- a/chrome/browser/ui/views/browser_dialogs_views_mac.cc
+++ b/chrome/browser/ui/views/browser_dialogs_views_mac.cc
@@ -9,9 +9,9 @@
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
#include "chrome/browser/ui/views/content_setting_bubble_contents.h"
+#include "chrome/browser/ui/views/page_info/website_settings_popup_view.h"
#include "chrome/browser/ui/views/task_manager_view.h"
#include "chrome/browser/ui/views/update_recommended_message_box.h"
-#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
// This file provides definitions of desktop browser dialog-creation methods for
// Mac where a Cocoa browser is using Views dialogs. I.e. it is included in the
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index e40229f3..0dc58c7 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -80,6 +80,7 @@
#include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
#include "chrome/browser/ui/views/new_back_shortcut_bubble.h"
#include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
+#include "chrome/browser/ui/views/page_info/website_settings_popup_view.h"
#include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
#include "chrome/browser/ui/views/status_bubble_views.h"
#include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
@@ -91,7 +92,6 @@
#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
#include "chrome/browser/ui/views/translate/translate_bubble_view.h"
#include "chrome/browser/ui/views/update_recommended_message_box.h"
-#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
#include "chrome/browser/ui/window_sizer/window_sizer.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/command.h"
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc
index d388e2f..bf75955 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/ui/view_ids.h"
#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
-#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
+#include "chrome/browser/ui/views/page_info/website_settings_popup_view.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/theme_resources.h"
#include "components/grit/components_scaled_resources.h"
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc b/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc
index ca23b00..9550122 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc
@@ -6,8 +6,8 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "chrome/browser/ui/views/page_info/website_settings_popup_view.h"
#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
-#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/interactive_test_utils.h"
diff --git a/chrome/browser/ui/views/page_info/OWNERS b/chrome/browser/ui/views/page_info/OWNERS
new file mode 100644
index 0000000..57a82ecf
--- /dev/null
+++ b/chrome/browser/ui/views/page_info/OWNERS
@@ -0,0 +1,6 @@
+benwells@chromium.org
+felt@chromium.org
+palmer@chromium.org
+raymes@chromium.org
+
+# COMPONENT: UI>Browser>Bubbles>PageInfo
diff --git a/chrome/browser/ui/views/website_settings/chosen_object_row.cc b/chrome/browser/ui/views/page_info/chosen_object_row.cc
similarity index 93%
rename from chrome/browser/ui/views/website_settings/chosen_object_row.cc
rename to chrome/browser/ui/views/page_info/chosen_object_row.cc
index b655d44..6fbd7b8 100644
--- a/chrome/browser/ui/views/website_settings/chosen_object_row.cc
+++ b/chrome/browser/ui/views/page_info/chosen_object_row.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/views/website_settings/chosen_object_row.h"
+#include "chrome/browser/ui/views/page_info/chosen_object_row.h"
-#include "chrome/browser/ui/views/website_settings/chosen_object_row_observer.h"
-#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
+#include "chrome/browser/ui/views/page_info/chosen_object_row_observer.h"
+#include "chrome/browser/ui/views/page_info/website_settings_popup_view.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/resources/grit/ui_resources.h"
diff --git a/chrome/browser/ui/views/website_settings/chosen_object_row.h b/chrome/browser/ui/views/page_info/chosen_object_row.h
similarity index 85%
rename from chrome/browser/ui/views/website_settings/chosen_object_row.h
rename to chrome/browser/ui/views/page_info/chosen_object_row.h
index 02a14c3..30fc5919 100644
--- a/chrome/browser/ui/views/website_settings/chosen_object_row.h
+++ b/chrome/browser/ui/views/page_info/chosen_object_row.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_CHOSEN_OBJECT_ROW_H_
-#define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_CHOSEN_OBJECT_ROW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_PAGE_INFO_CHOSEN_OBJECT_ROW_H_
+#define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_CHOSEN_OBJECT_ROW_H_
#include "base/macros.h"
#include "chrome/browser/ui/page_info/website_settings_ui.h"
@@ -42,4 +42,4 @@
DISALLOW_COPY_AND_ASSIGN(ChosenObjectRow);
};
-#endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_CHOSEN_OBJECT_ROW_H_
+#endif // CHROME_BROWSER_UI_VIEWS_PAGE_INFO_CHOSEN_OBJECT_ROW_H_
diff --git a/chrome/browser/ui/views/website_settings/chosen_object_row_observer.h b/chrome/browser/ui/views/page_info/chosen_object_row_observer.h
similarity index 67%
rename from chrome/browser/ui/views/website_settings/chosen_object_row_observer.h
rename to chrome/browser/ui/views/page_info/chosen_object_row_observer.h
index ef76b00..42bd32f 100644
--- a/chrome/browser/ui/views/website_settings/chosen_object_row_observer.h
+++ b/chrome/browser/ui/views/page_info/chosen_object_row_observer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_CHOSEN_OBJECT_ROW_OBSERVER_H_
-#define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_CHOSEN_OBJECT_ROW_OBSERVER_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_PAGE_INFO_CHOSEN_OBJECT_ROW_OBSERVER_H_
+#define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_CHOSEN_OBJECT_ROW_OBSERVER_H_
#include "chrome/browser/ui/page_info/website_settings_ui.h"
@@ -17,4 +17,4 @@
virtual ~ChosenObjectRowObserver() {}
};
-#endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_CHOSEN_OBJECT_ROW_OBSERVER_H_
+#endif // CHROME_BROWSER_UI_VIEWS_PAGE_INFO_CHOSEN_OBJECT_ROW_OBSERVER_H_
diff --git a/chrome/browser/ui/views/website_settings/non_accessible_image_view.cc b/chrome/browser/ui/views/page_info/non_accessible_image_view.cc
similarity index 82%
rename from chrome/browser/ui/views/website_settings/non_accessible_image_view.cc
rename to chrome/browser/ui/views/page_info/non_accessible_image_view.cc
index d0638d8..eca9f37 100644
--- a/chrome/browser/ui/views/website_settings/non_accessible_image_view.cc
+++ b/chrome/browser/ui/views/page_info/non_accessible_image_view.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/views/website_settings/non_accessible_image_view.h"
+#include "chrome/browser/ui/views/page_info/non_accessible_image_view.h"
#include "ui/accessibility/ax_enums.h"
#include "ui/accessibility/ax_node_data.h"
diff --git a/chrome/browser/ui/views/website_settings/non_accessible_image_view.h b/chrome/browser/ui/views/page_info/non_accessible_image_view.h
similarity index 69%
rename from chrome/browser/ui/views/website_settings/non_accessible_image_view.h
rename to chrome/browser/ui/views/page_info/non_accessible_image_view.h
index 80eb9956..c0ae82ad 100644
--- a/chrome/browser/ui/views/website_settings/non_accessible_image_view.h
+++ b/chrome/browser/ui/views/page_info/non_accessible_image_view.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_NON_ACCESSIBLE_IMAGE_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_NON_ACCESSIBLE_IMAGE_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_PAGE_INFO_NON_ACCESSIBLE_IMAGE_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_NON_ACCESSIBLE_IMAGE_VIEW_H_
#include "base/macros.h"
#include "ui/views/controls/image_view.h"
@@ -20,4 +20,4 @@
DISALLOW_COPY_AND_ASSIGN(NonAccessibleImageView);
};
-#endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_NON_ACCESSIBLE_IMAGE_VIEW_H_
+#endif // CHROME_BROWSER_UI_VIEWS_PAGE_INFO_NON_ACCESSIBLE_IMAGE_VIEW_H_
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_row.cc b/chrome/browser/ui/views/page_info/permission_selector_row.cc
similarity index 97%
rename from chrome/browser/ui/views/website_settings/permission_selector_row.cc
rename to chrome/browser/ui/views/page_info/permission_selector_row.cc
index 8efa7385..3ac5644 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_row.cc
+++ b/chrome/browser/ui/views/page_info/permission_selector_row.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/views/website_settings/permission_selector_row.h"
+#include "chrome/browser/ui/views/page_info/permission_selector_row.h"
#include "base/i18n/rtl.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/page_info/permission_menu_model.h"
#include "chrome/browser/ui/page_info/website_settings_ui.h"
-#include "chrome/browser/ui/views/website_settings/non_accessible_image_view.h"
-#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
+#include "chrome/browser/ui/views/page_info/non_accessible_image_view.h"
+#include "chrome/browser/ui/views/page_info/website_settings_popup_view.h"
#include "chrome/grit/generated_resources.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/base/material_design/material_design_controller.h"
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_row.h b/chrome/browser/ui/views/page_info/permission_selector_row.h
similarity index 89%
rename from chrome/browser/ui/views/website_settings/permission_selector_row.h
rename to chrome/browser/ui/views/page_info/permission_selector_row.h
index a2ff854..8150a81 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_row.h
+++ b/chrome/browser/ui/views/page_info/permission_selector_row.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_H_
-#define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PERMISSION_SELECTOR_ROW_H_
+#define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PERMISSION_SELECTOR_ROW_H_
#include <memory>
@@ -12,7 +12,7 @@
#include "base/observer_list.h"
#include "chrome/browser/ui/page_info/permission_menu_model.h"
#include "chrome/browser/ui/page_info/website_settings_ui.h"
-#include "chrome/browser/ui/views/website_settings/permission_selector_row_observer.h"
+#include "chrome/browser/ui/views/page_info/permission_selector_row_observer.h"
#include "components/content_settings/core/common/content_settings.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "ui/views/controls/button/menu_button_listener.h"
@@ -85,4 +85,4 @@
DISALLOW_COPY_AND_ASSIGN(PermissionSelectorRow);
};
-#endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_H_
+#endif // CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PERMISSION_SELECTOR_ROW_H_
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_row_observer.h b/chrome/browser/ui/views/page_info/permission_selector_row_observer.h
similarity index 66%
rename from chrome/browser/ui/views/website_settings/permission_selector_row_observer.h
rename to chrome/browser/ui/views/page_info/permission_selector_row_observer.h
index 6e836a68..8d7a98f 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_row_observer.h
+++ b/chrome/browser/ui/views/page_info/permission_selector_row_observer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_OBSERVER_H_
-#define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_OBSERVER_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PERMISSION_SELECTOR_ROW_OBSERVER_H_
+#define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PERMISSION_SELECTOR_ROW_OBSERVER_H_
#include "chrome/browser/ui/page_info/website_settings_ui.h"
@@ -17,4 +17,4 @@
virtual ~PermissionSelectorRowObserver() {}
};
-#endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_OBSERVER_H_
+#endif // CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PERMISSION_SELECTOR_ROW_OBSERVER_H_
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/page_info/website_settings_popup_view.cc
similarity index 98%
rename from chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
rename to chrome/browser/ui/views/page_info/website_settings_popup_view.cc
index 502bb47..dbfc251 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
+++ b/chrome/browser/ui/views/page_info/website_settings_popup_view.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
+#include "chrome/browser/ui/views/page_info/website_settings_popup_view.h"
#include <stddef.h>
@@ -24,9 +24,9 @@
#include "chrome/browser/ui/page_info/website_settings.h"
#include "chrome/browser/ui/views/collected_cookies_views.h"
#include "chrome/browser/ui/views/harmony/layout_delegate.h"
-#include "chrome/browser/ui/views/website_settings/chosen_object_row.h"
-#include "chrome/browser/ui/views/website_settings/non_accessible_image_view.h"
-#include "chrome/browser/ui/views/website_settings/permission_selector_row.h"
+#include "chrome/browser/ui/views/page_info/chosen_object_row.h"
+#include "chrome/browser/ui/views/page_info/non_accessible_image_view.h"
+#include "chrome/browser/ui/views/page_info/permission_selector_row.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h b/chrome/browser/ui/views/page_info/website_settings_popup_view.h
similarity index 92%
rename from chrome/browser/ui/views/website_settings/website_settings_popup_view.h
rename to chrome/browser/ui/views/page_info/website_settings_popup_view.h
index 8fa0cc6..557dc0c 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h
+++ b/chrome/browser/ui/views/page_info/website_settings_popup_view.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_PAGE_INFO_WEBSITE_SETTINGS_POPUP_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_WEBSITE_SETTINGS_POPUP_VIEW_H_
#include <memory>
@@ -11,9 +11,9 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/ui/page_info/website_settings_ui.h"
-#include "chrome/browser/ui/views/website_settings/chosen_object_row_observer.h"
-#include "chrome/browser/ui/views/website_settings/permission_selector_row.h"
-#include "chrome/browser/ui/views/website_settings/permission_selector_row_observer.h"
+#include "chrome/browser/ui/views/page_info/chosen_object_row_observer.h"
+#include "chrome/browser/ui/views/page_info/permission_selector_row.h"
+#include "chrome/browser/ui/views/page_info/permission_selector_row_observer.h"
#include "content/public/browser/web_contents_observer.h"
#include "ui/views/bubble/bubble_dialog_delegate.h"
#include "ui/views/controls/button/button.h"
@@ -183,4 +183,4 @@
DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupView);
};
-#endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
+#endif // CHROME_BROWSER_UI_VIEWS_PAGE_INFO_WEBSITE_SETTINGS_POPUP_VIEW_H_
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view_interactive_uitest.cc b/chrome/browser/ui/views/page_info/website_settings_popup_view_interactive_uitest.cc
similarity index 96%
rename from chrome/browser/ui/views/website_settings/website_settings_popup_view_interactive_uitest.cc
rename to chrome/browser/ui/views/page_info/website_settings_popup_view_interactive_uitest.cc
index 28efa6e..822c1c29 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/page_info/website_settings_popup_view_interactive_uitest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
+#include "chrome/browser/ui/views/page_info/website_settings_popup_view.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc b/chrome/browser/ui/views/page_info/website_settings_popup_view_unittest.cc
similarity index 97%
rename from chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
rename to chrome/browser/ui/views/page_info/website_settings_popup_view_unittest.cc
index 5e9255dc..00f2047 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
+++ b/chrome/browser/ui/views/page_info/website_settings_popup_view_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
+#include "chrome/browser/ui/views/page_info/website_settings_popup_view.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
-#include "chrome/browser/ui/views/website_settings/chosen_object_row.h"
-#include "chrome/browser/ui/views/website_settings/permission_selector_row.h"
+#include "chrome/browser/ui/views/page_info/chosen_object_row.h"
+#include "chrome/browser/ui/views/page_info/permission_selector_row.h"
#include "chrome/browser/usb/usb_chooser_context.h"
#include "chrome/browser/usb/usb_chooser_context_factory.h"
#include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/ui/views/website_settings/OWNERS b/chrome/browser/ui/views/website_settings/OWNERS
index 58f8c3a9..a78ee5a 100644
--- a/chrome/browser/ui/views/website_settings/OWNERS
+++ b/chrome/browser/ui/views/website_settings/OWNERS
@@ -3,4 +3,4 @@
palmer@chromium.org
raymes@chromium.org
-# COMPONENT: UI>Browser>SiteSettings
+# COMPONENT: UI>Browser>Permissions>Prompts
diff --git a/chrome/browser/ui/views/website_settings/permission_prompt_impl.cc b/chrome/browser/ui/views/website_settings/permission_prompt_impl.cc
index 3d115e0..582c3ba 100644
--- a/chrome/browser/ui/views/website_settings/permission_prompt_impl.cc
+++ b/chrome/browser/ui/views/website_settings/permission_prompt_impl.cc
@@ -17,8 +17,8 @@
#include "chrome/browser/ui/layout_constants.h"
#include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
#include "chrome/browser/ui/views/harmony/layout_delegate.h"
-#include "chrome/browser/ui/views/website_settings/permission_selector_row.h"
-#include "chrome/browser/ui/views/website_settings/permission_selector_row_observer.h"
+#include "chrome/browser/ui/views/page_info/permission_selector_row.h"
+#include "chrome/browser/ui/views/page_info/permission_selector_row_observer.h"
#include "chrome/grit/generated_resources.h"
#include "components/strings/grit/components_strings.h"
#include "components/url_formatter/elide_url.h"
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 72450d30..d2612b5 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -558,6 +558,7 @@
"../browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc",
"../browser/ui/views/location_bar/star_view_browsertest.cc",
"../browser/ui/views/omnibox/omnibox_view_views_browsertest.cc",
+ "../browser/ui/views/page_info/website_settings_popup_view_interactive_uitest.cc",
"../browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc",
"../browser/ui/views/passwords/manage_passwords_icon_view_interactive_uitest.cc",
"../browser/ui/views/ssl_client_certificate_selector_browsertest.cc",
@@ -567,7 +568,6 @@
"../browser/ui/views/toolbar/toolbar_button_interactive_uitest.cc",
"../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc",
"../browser/ui/views/translate/translate_bubble_test_utils_views.cc",
- "../browser/ui/views/website_settings/website_settings_popup_view_interactive_uitest.cc",
"base/interactive_test_utils_views.cc",
]
}
@@ -4805,11 +4805,11 @@
"../browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc",
"../browser/ui/views/confirm_bubble_views_unittest.cc",
"../browser/ui/views/global_error_bubble_view_unittest.cc",
+ "../browser/ui/views/page_info/website_settings_popup_view_unittest.cc",
"../browser/ui/views/payments/credit_card_editor_view_controller_unittest.cc",
"../browser/ui/views/payments/payment_request_item_list_unittest.cc",
"../browser/ui/views/payments/validating_textfield_unittest.cc",
"../browser/ui/views/payments/view_stack_unittest.cc",
- "../browser/ui/views/website_settings/website_settings_popup_view_unittest.cc",
]
if (is_chromeos) {
sources += [ "../browser/ui/views/ime_driver/input_method_bridge_chromeos_unittest.cc" ]
