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

chrome/chrome_browser_ui.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 478 matching lines @@
       'browser/ui/android/toolbar/toolbar_model_android.cc',
       'browser/ui/android/toolbar/toolbar_model_android.h',
       'browser/ui/android/usb_chooser_dialog_android.cc',
       'browser/ui/android/usb_chooser_dialog_android.h',
       'browser/ui/android/view_android_helper.cc',
       'browser/ui/android/view_android_helper.h',
       'browser/ui/android/website_settings_popup_android.cc',
       '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.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/offline/offline_internals_ui.cc',
-      'browser/ui/webui/offline/offline_internals_ui.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',
       'browser/ui/webui/popular_sites_internals_ui.h',
       'browser/ui/webui/snippets_internals_message_handler.cc',
       'browser/ui/webui/snippets_internals_message_handler.h',
       'browser/ui/webui/snippets_internals_ui.cc',
       'browser/ui/webui/snippets_internals_ui.h',
     ],
     # Cross-platform ash sources.
@@ skipping 257 matching lines @@
       'browser/ui/app_list/arc/arc_app_launcher.cc',
       'browser/ui/app_list/arc/arc_app_launcher.h',
       'browser/ui/app_list/arc/arc_app_list_prefs.cc',
       'browser/ui/app_list/arc/arc_app_list_prefs.h',
       'browser/ui/app_list/arc/arc_app_list_prefs_factory.cc',
       'browser/ui/app_list/arc/arc_app_list_prefs_factory.h',
       'browser/ui/app_list/arc/arc_app_model_builder.cc',
       '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',
       'browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h',
       'browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc',
       'browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h',
       'browser/ui/ash/launcher/arc_app_window_launcher_controller.cc',
       'browser/ui/ash/launcher/arc_app_window_launcher_controller.h',
       'browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc',
       'browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h',
@@ skipping 561 matching lines @@
       'browser/ui/cocoa/window_size_autosaver.h',
       'browser/ui/cocoa/window_size_autosaver.mm',
       # TODO(estade): this class should be deleted in favor of a combobox model.
       # See crbug.com/590850
       'browser/ui/content_settings/content_setting_media_menu_model.cc',
       'browser/ui/content_settings/content_setting_media_menu_model.h',
       'browser/ui/proximity_auth/proximity_auth_error_bubble_stub.cc',
     ],
     # Files used only on desktop systems (not iOS, Android, ChromeOS).
     'chrome_browser_ui_desktop_sources': [
+      'browser/ui/avatar_button_error_controller.cc',
       'browser/ui/avatar_button_error_controller.h',
-      'browser/ui/avatar_button_error_controller.cc',
       'browser/ui/avatar_button_error_controller_delegate.h',
       'browser/ui/startup/default_browser_infobar_delegate.cc',
       'browser/ui/startup/default_browser_infobar_delegate.h',
       'browser/ui/startup/default_browser_prompt.cc',
       'browser/ui/startup/default_browser_prompt.h',
       'browser/ui/startup/default_browser_prompt_win.cc',
       'browser/ui/sync/one_click_signin_links_delegate.h',
       'browser/ui/sync/one_click_signin_links_delegate_impl.cc',
       'browser/ui/sync/one_click_signin_links_delegate_impl.h',
       'browser/ui/sync/one_click_signin_sync_observer.cc',
@@ skipping 693 matching lines @@
       'browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc',
       'browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.h',
       'browser/ui/webui/settings/chromeos/internet_handler.cc',
       'browser/ui/webui/settings/chromeos/internet_handler.h',
       'browser/ui/webui/settings/downloads_handler.cc',
       'browser/ui/webui/settings/downloads_handler.h',
       'browser/ui/webui/settings/font_handler.cc',
       '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',
       'browser/ui/webui/settings/profile_info_handler.h',
       'browser/ui/webui/settings/protocol_handlers_handler.cc',
       'browser/ui/webui/settings/protocol_handlers_handler.h',
       'browser/ui/webui/settings/reset_settings_handler.cc',
       'browser/ui/webui/settings/reset_settings_handler.h',
       'browser/ui/webui/settings/search_engines_handler.cc',
       'browser/ui/webui/settings/search_engines_handler.h',
@@ skipping 121 matching lines @@
       'browser/ui/views/login_view.cc',
       'browser/ui/views/login_view.h',
       'browser/ui/views/new_back_shortcut_bubble.cc',
       'browser/ui/views/new_back_shortcut_bubble.h',
       'browser/ui/views/subtle_notification_view.cc',
       'browser/ui/views/subtle_notification_view.h',
       'browser/ui/views/sync/bubble_sync_promo_view.cc',
       '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',
     ],
     # Views files for ChromeOS.
     'chrome_browser_ui_views_chromeos_sources': [
       'browser/ui/views/apps/app_info_dialog/arc_app_info_links_panel.cc',
       'browser/ui/views/apps/app_info_dialog/arc_app_info_links_panel.h',
     ],
     # Views files for everywhere but ChromeOS.
     'chrome_browser_ui_views_non_chromeos_sources': [
@@ skipping 1140 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }