Material Page Info (Views, 1/3): Rename {ChosenObject, PermissionSelector}View classes to {...}Row.

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 70a9b58fe5996a886fb462463113f28006e5649f..a2a2ba20d426dbfc6d6cb71805736c6a848dcbfa 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -496,10 +496,10 @@
       'browser/ui/android/website_settings_popup_android.h',
       'browser/ui/browser_otr_state_android.cc',
       'browser/ui/screen_capture_notification_ui_stub.cc',
-      'browser/ui/webui/offline/offline_internals_ui_message_handler.cc',
-      'browser/ui/webui/offline/offline_internals_ui_message_handler.h',
       'browser/ui/webui/offline/offline_internals_ui.cc',

[msw, 2016/09/01 01:42:08]

Looks like a tangential/unintentional change or rebase issue?

[lgarron, 2016/09/02 02:56:49]

Indeed, a rebase issue. [1]
Fixed in the latest patch.

[1] https://twitter.com/lgarron/status/771092242165399552

       'browser/ui/webui/offline/offline_internals_ui.h',
+      'browser/ui/webui/offline/offline_internals_ui_message_handler.cc',
+      'browser/ui/webui/offline/offline_internals_ui_message_handler.h',
       'browser/ui/webui/popular_sites_internals_message_handler.cc',
       'browser/ui/webui/popular_sites_internals_message_handler.h',
       'browser/ui/webui/popular_sites_internals_ui.cc',
@@ -777,12 +777,12 @@
       'browser/ui/app_list/arc/arc_app_model_builder.h',
       'browser/ui/app_list/arc/arc_app_utils.cc',
       'browser/ui/app_list/arc/arc_app_utils.h',
+      'browser/ui/app_list/arc/arc_package_sync_data_type_controller.cc',
+      'browser/ui/app_list/arc/arc_package_sync_data_type_controller.h',
       'browser/ui/app_list/arc/arc_package_syncable_service.cc',
       'browser/ui/app_list/arc/arc_package_syncable_service.h',
       'browser/ui/app_list/arc/arc_package_syncable_service_factory.cc',
       'browser/ui/app_list/arc/arc_package_syncable_service_factory.h',
-      'browser/ui/app_list/arc/arc_package_sync_data_type_controller.cc',
-      'browser/ui/app_list/arc/arc_package_sync_data_type_controller.h',
       'browser/ui/app_list/search/arc_app_result.cc',
       'browser/ui/app_list/search/arc_app_result.h',
       'browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc',
@@ -1364,8 +1364,8 @@
     ],
     # Files used only on desktop systems (not iOS, Android, ChromeOS).
     'chrome_browser_ui_desktop_sources': [
-      'browser/ui/avatar_button_error_controller.h',
       'browser/ui/avatar_button_error_controller.cc',
+      'browser/ui/avatar_button_error_controller.h',
       'browser/ui/avatar_button_error_controller_delegate.h',
       'browser/ui/startup/default_browser_infobar_delegate.cc',
       'browser/ui/startup/default_browser_infobar_delegate.h',
@@ -2079,12 +2079,12 @@
       'browser/ui/webui/settings/font_handler.h',
       'browser/ui/webui/settings/languages_handler.cc',
       'browser/ui/webui/settings/languages_handler.h',
-      'browser/ui/webui/settings/metrics_reporting_handler.cc',
-      'browser/ui/webui/settings/metrics_reporting_handler.h',
       'browser/ui/webui/settings/md_settings_localized_strings_provider.cc',
       'browser/ui/webui/settings/md_settings_localized_strings_provider.h',
       'browser/ui/webui/settings/md_settings_ui.cc',
       'browser/ui/webui/settings/md_settings_ui.h',
+      'browser/ui/webui/settings/metrics_reporting_handler.cc',
+      'browser/ui/webui/settings/metrics_reporting_handler.h',
       'browser/ui/webui/settings/people_handler.cc',
       'browser/ui/webui/settings/people_handler.h',
       'browser/ui/webui/settings/profile_info_handler.cc',
@@ -2226,13 +2226,14 @@
       'browser/ui/views/sync/bubble_sync_promo_view.h',
       'browser/ui/views/task_manager_view.cc',
       'browser/ui/views/task_manager_view.h',
-      'browser/ui/views/website_settings/chosen_object_view.cc',
-      'browser/ui/views/website_settings/chosen_object_view.h',
+      'browser/ui/views/website_settings/chosen_object_row.cc',
+      'browser/ui/views/website_settings/chosen_object_row.h',
+      'browser/ui/views/website_settings/chosen_object_row_observer.h',
       'browser/ui/views/website_settings/permission_prompt_impl.cc',
       'browser/ui/views/website_settings/permission_prompt_impl.h',
-      'browser/ui/views/website_settings/permission_selector_view.cc',
-      'browser/ui/views/website_settings/permission_selector_view.h',
-      'browser/ui/views/website_settings/permission_selector_view_observer.h',
+      'browser/ui/views/website_settings/permission_selector_row.cc',
+      'browser/ui/views/website_settings/permission_selector_row.h',
+      'browser/ui/views/website_settings/permission_selector_row_observer.h',
       'browser/ui/views/website_settings/website_settings_popup_view.cc',
       'browser/ui/views/website_settings/website_settings_popup_view.h',
     ],