MacViews: gyp change for building MacViews browser.

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 1825 matching lines @@
       'browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h',
       'browser/ui/webui/system_info_ui.cc',
       'browser/ui/webui/system_info_ui.h',
       'browser/ui/webui/theme_handler.cc',
       'browser/ui/webui/theme_handler.h',
       'browser/ui/webui/uber/uber_ui.cc',
       'browser/ui/webui/uber/uber_ui.h',
       'browser/ui/window_sizer/window_sizer.cc',
       'browser/ui/window_sizer/window_sizer.h',
     ],
-    # Cross-platform views sources also ready for toolkit-views on Mac.
+    # Cross-platform views sources for all desktop platforms.

[tapted, 2015/03/06 02:38:57]

I liked the old comment :). The idea is that when someone adds a file, they will
be steered away from putting it in this list, since it's probably not ready to
run on Mac yet. 

[Andre, 2015/03/06 18:34:39]

Done.

     'chrome_browser_ui_views_sources': [
       'browser/ui/app_list/app_list_controller_delegate_views.cc',
       'browser/ui/app_list/app_list_controller_delegate_views.h',
       'browser/ui/app_list/app_list_service_views.cc',
       'browser/ui/app_list/app_list_service_views.h',
       'browser/ui/app_list/app_list_shower_views.cc',
       'browser/ui/app_list/app_list_shower_views.h',
       'browser/ui/views/apps/chrome_native_app_window_views.cc',
       'browser/ui/views/apps/chrome_native_app_window_views.h',
       'browser/ui/views/apps/desktop_keyboard_capture.cc',
       'browser/ui/views/apps/desktop_keyboard_capture.h',
       'browser/ui/views/apps/keyboard_hook_handler.cc',
       'browser/ui/views/apps/keyboard_hook_handler.h',
       'browser/ui/views/chrome_browser_main_extra_parts_views.cc',
       'browser/ui/views/chrome_browser_main_extra_parts_views.h',
       'browser/ui/views/chrome_constrained_window_views_client.cc',
       'browser/ui/views/chrome_constrained_window_views_client.h',
       'browser/ui/views/chrome_views_delegate.cc',
       'browser/ui/views/chrome_views_delegate.h',
-      'browser/ui/views/collected_cookies_views.cc',
-      'browser/ui/views/collected_cookies_views.h',
-      'browser/ui/views/cookie_info_view.cc',
-      'browser/ui/views/cookie_info_view.h',
-      'browser/ui/views/extensions/extension_keybinding_registry_views.cc',
-      'browser/ui/views/extensions/extension_keybinding_registry_views.h',
-      'browser/ui/views/find_bar_host.cc',
-      'browser/ui/views/find_bar_host.h',
-      'browser/ui/views/find_bar_view.cc',
-      'browser/ui/views/find_bar_view.h',
-      'browser/ui/views/frame/taskbar_decorator.cc',
-      'browser/ui/views/frame/taskbar_decorator.h',
-      'browser/ui/views/hung_renderer_view.cc',
-      'browser/ui/views/hung_renderer_view.h',
-      'browser/ui/views/infobars/confirm_infobar.cc',
-      'browser/ui/views/infobars/confirm_infobar.h',
-      'browser/ui/views/passwords/credentials_item_view.cc',
-      'browser/ui/views/passwords/credentials_item_view.h',
-      'browser/ui/views/passwords/manage_credential_item_view.cc',
-      'browser/ui/views/passwords/manage_credential_item_view.h',
-      'browser/ui/views/passwords/manage_password_items_view.cc',
-      'browser/ui/views/passwords/manage_password_items_view.h',
-      'browser/ui/views/passwords/manage_passwords_bubble_view.cc',
-      'browser/ui/views/passwords/manage_passwords_bubble_view.h',
-      'browser/ui/views/passwords/manage_passwords_icon_view.cc',
-      'browser/ui/views/passwords/manage_passwords_icon_view.h',
-      'browser/ui/views/tab_dialogs_views.cc',
-      'browser/ui/views/tab_dialogs_views.h',
-      'browser/ui/views/tabs/browser_tab_strip_controller.cc',
-      'browser/ui/views/tabs/browser_tab_strip_controller.h',
-      'browser/ui/views/tabs/media_indicator_button.cc',
-      'browser/ui/views/tabs/media_indicator_button.h',
-      'browser/ui/views/tabs/stacked_tab_strip_layout.cc',
-      'browser/ui/views/tabs/stacked_tab_strip_layout.h',
-      'browser/ui/views/tabs/tab.cc',
-      'browser/ui/views/tabs/tab.h',
-      'browser/ui/views/tabs/tab_controller.h',
-      'browser/ui/views/tabs/tab_drag_controller.cc',
-      'browser/ui/views/tabs/tab_drag_controller.h',
-      'browser/ui/views/tabs/tab_strip.cc',
-      'browser/ui/views/tabs/tab_strip.h',
-      'browser/ui/views/tabs/tab_strip_controller.h',
-      'browser/ui/views/tabs/window_finder.h',
-      'browser/ui/views/tabs/window_finder_chromeos.cc',
-      'browser/ui/views/tabs/window_finder_mac.mm',
-      'browser/ui/views/tabs/window_finder_win.cc',
-      'browser/ui/views/toolbar/back_button.cc',
-      'browser/ui/views/toolbar/back_button.h',
-      'browser/ui/views/toolbar/browser_action_test_util_views.cc',
-      'browser/ui/views/toolbar/browser_actions_container.cc',
-      'browser/ui/views/toolbar/browser_actions_container.h',
-      'browser/ui/views/toolbar/browser_actions_container_observer.h',
-      'browser/ui/views/toolbar/chevron_menu_button.cc',
-      'browser/ui/views/toolbar/chevron_menu_button.h',
-      'browser/ui/views/toolbar/extension_toolbar_menu_view.cc',
-      'browser/ui/views/toolbar/extension_toolbar_menu_view.h',
-      'browser/ui/views/toolbar/home_button.cc',
-      'browser/ui/views/toolbar/home_button.h',
-      'browser/ui/views/toolbar/reload_button.cc',
-      'browser/ui/views/toolbar/reload_button.h',
-      'browser/ui/views/toolbar/toolbar_action_view.cc',
-      'browser/ui/views/toolbar/toolbar_action_view.h',
-      'browser/ui/views/toolbar/toolbar_action_view_delegate_views.h',
-      'browser/ui/views/toolbar/toolbar_button.cc',
-      'browser/ui/views/toolbar/toolbar_button.h',
-      'browser/ui/views/toolbar/toolbar_view.cc',
-      'browser/ui/views/toolbar/toolbar_view.h',
-      'browser/ui/views/toolbar/wrench_menu.cc',
-      'browser/ui/views/toolbar/wrench_menu.h',
-      'browser/ui/views/toolbar/wrench_menu_observer.h',
-      'browser/ui/views/toolbar/wrench_toolbar_button.cc',
-      'browser/ui/views/toolbar/wrench_toolbar_button.h',
     ],
-    # Views files for everwhere but ChromeOS.
-    'chrome_browser_ui_views_non_chromeos_sources': [
-      'browser/ui/views/chrome_views_delegate_aura.cc',
-      'browser/ui/views/external_protocol_dialog.cc',
-      'browser/ui/views/external_protocol_dialog.h',
-      'browser/ui/views/frame/desktop_browser_frame_aura.cc',
-      'browser/ui/views/frame/desktop_browser_frame_aura.h',
-      'browser/ui/views/message_center/message_center_frame_view.cc',
-      'browser/ui/views/message_center/message_center_frame_view.h',
-      'browser/ui/views/message_center/message_center_widget_delegate.cc',
-      'browser/ui/views/message_center/message_center_widget_delegate.h',
-      'browser/ui/views/message_center/web_notification_tray.cc',
-      'browser/ui/views/message_center/web_notification_tray.h',
-      'browser/ui/views/message_center/web_notification_tray_win.cc',
-      'browser/ui/views/screen_capture_notification_ui_views.cc',
-    ],
-    # Cross-platform (except Mac) views sources. We assume app list is enabled.
-    'chrome_browser_ui_views_non_mac_sources': [
+    # Cross-platform views sources for desktop platforms except for Mac-Cocoa
+    # (including the experimental Mac-Views browser).
+    'chrome_browser_ui_views_browser_sources': [

[tapted, 2015/03/06 02:38:57]

I think having both chrome_browser_ui_views_sources and
chrome_browser_ui_views_browser_sources is confusing..

The current chrome_browser_ui_views_sources is the list where we eventually want
everything to be, so I think that's the right name there.

But we probably want new files to go into this list. I see that "non_mac"
doesn't really fit since mac_views_browser wants them. Perhaps
chrome_browser_ui_views_stable_sources ? I don't really like that name, but
can't think of something better yet. In the comment, I wouldn't mention Cocoa
("Mac-Cocoa" is basically "MacViews" v1.0 so having two names is also
confusing).

But I would say in the comment something like "You probably want to add new
files here."

And, to make it clear why this exists I think it's also worth having a `TODO(..)
Migrate to chrome_browser_ui_views_sources when the files are ready for release
on Mac`

[Andre, 2015/03/06 18:34:39]

Yeah, I think non_mac is probably the best name for now.
It would be clearest to most people, it's still basically non-mac to everyone
except for us (for now).
Changing it back.

       'browser/ui/views/accelerator_utils_aura.cc',
       'browser/ui/views/accessibility/invert_bubble_view.cc',
       'browser/ui/views/accessibility/invert_bubble_view.h',
       'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h',
       'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h',
       'browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_header_panel.h',
       'browser/ui/views/apps/app_info_dialog/app_info_panel.cc',
@@ skipping 60 matching lines @@
       'browser/ui/views/bookmarks/bookmark_menu_delegate.cc',
       'browser/ui/views/bookmarks/bookmark_menu_delegate.h',
       'browser/ui/views/bookmarks/bookmark_sync_promo_view.cc',
       'browser/ui/views/bookmarks/bookmark_sync_promo_view.h',
       'browser/ui/views/certificate_selector.cc',
       'browser/ui/views/certificate_selector.h',
       'browser/ui/views/certificate_viewer_win.cc',
       'browser/ui/views/chrome_javascript_native_dialog_factory_views.cc',
       'browser/ui/views/chrome_views_delegate_chromeos.cc',
       'browser/ui/views/chrome_web_dialog_view.cc',
+      'browser/ui/views/collected_cookies_views.cc',
+      'browser/ui/views/collected_cookies_views.h',
       'browser/ui/views/color_chooser_aura.cc',
       'browser/ui/views/color_chooser_aura.h',
       'browser/ui/views/color_chooser_win.cc',
       'browser/ui/views/confirm_bubble_views.cc',
       'browser/ui/views/confirm_bubble_views.h',
       'browser/ui/views/conflicting_module_view_win.cc',
       'browser/ui/views/conflicting_module_view_win.h',
       'browser/ui/views/constrained_web_dialog_delegate_views.cc',
       'browser/ui/views/content_setting_bubble_contents.cc',
       'browser/ui/views/content_setting_bubble_contents.h',
+      'browser/ui/views/cookie_info_view.cc',
+      'browser/ui/views/cookie_info_view.h',
       'browser/ui/views/create_application_shortcut_view.cc',
       'browser/ui/views/create_application_shortcut_view.h',
       'browser/ui/views/critical_notification_bubble_view.cc',
       'browser/ui/views/critical_notification_bubble_view.h',
-      'browser/ui/views/crypto_module_password_dialog_view.cc',
-      'browser/ui/views/crypto_module_password_dialog_view.h',
-      'browser/ui/views/desktop_media_picker_views.cc',
-      'browser/ui/views/desktop_media_picker_views.h',
       'browser/ui/views/download/download_danger_prompt_views.cc',
       'browser/ui/views/download/download_feedback_dialog_view.cc',
       'browser/ui/views/download/download_feedback_dialog_view.h',
       'browser/ui/views/download/download_in_progress_dialog_view.cc',
       'browser/ui/views/download/download_in_progress_dialog_view.h',
       'browser/ui/views/download/download_item_view.cc',
       'browser/ui/views/download/download_item_view.h',
       'browser/ui/views/download/download_shelf_context_menu_view.cc',
       'browser/ui/views/download/download_shelf_context_menu_view.h',
       'browser/ui/views/download/download_shelf_view.cc',
@@ skipping 22 matching lines @@
       'browser/ui/views/extensions/device_permissions_dialog_view.h',
       'browser/ui/views/extensions/extension_action_platform_delegate_views.cc',
       'browser/ui/views/extensions/extension_action_platform_delegate_views.h',
       'browser/ui/views/extensions/extension_dialog.cc',
       'browser/ui/views/extensions/extension_dialog.h',
       'browser/ui/views/extensions/extension_dialog_observer.cc',
       'browser/ui/views/extensions/extension_dialog_observer.h',
       'browser/ui/views/extensions/extension_install_dialog_view.cc',
       'browser/ui/views/extensions/extension_installed_bubble_view.cc',
       'browser/ui/views/extensions/extension_installed_bubble_view.h',
+      'browser/ui/views/extensions/extension_keybinding_registry_views.cc',
+      'browser/ui/views/extensions/extension_keybinding_registry_views.h',
       'browser/ui/views/extensions/extension_message_bubble_view.cc',
       'browser/ui/views/extensions/extension_message_bubble_view.h',
       'browser/ui/views/extensions/extension_popup.cc',
       'browser/ui/views/extensions/extension_popup.h',
       'browser/ui/views/extensions/extension_popup_aura.cc',
       'browser/ui/views/extensions/extension_popup_aura.h',
       'browser/ui/views/extensions/extension_uninstall_dialog_view.cc',
       'browser/ui/views/extensions/extension_view_views.cc',
       'browser/ui/views/extensions/extension_view_views.h',
       'browser/ui/views/extensions/media_galleries_dialog_views.cc',
       'browser/ui/views/extensions/media_galleries_dialog_views.h',
       'browser/ui/views/extensions/media_gallery_checkbox_view.cc',
       'browser/ui/views/extensions/media_gallery_checkbox_view.h',
+      'browser/ui/views/find_bar_host.cc',
+      'browser/ui/views/find_bar_host.h',
+      'browser/ui/views/find_bar_view.cc',
+      'browser/ui/views/find_bar_view.h',
       'browser/ui/views/first_run_bubble.cc',
       'browser/ui/views/first_run_bubble.h',
       'browser/ui/views/frame/browser_frame.cc',
       'browser/ui/views/frame/browser_frame.h',
       'browser/ui/views/frame/browser_frame_common_win.cc',
       'browser/ui/views/frame/browser_frame_common_win.h',
       'browser/ui/views/frame/browser_frame_mac.h',
       'browser/ui/views/frame/browser_frame_mac.mm',
       'browser/ui/views/frame/browser_non_client_frame_view.cc',
       'browser/ui/views/frame/browser_non_client_frame_view.h',
@@ skipping 36 matching lines @@
       'browser/ui/views/frame/opaque_browser_frame_view_linux.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_linux.h',
       'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.h',
       'browser/ui/views/frame/system_menu_insertion_delegate_win.cc',
       'browser/ui/views/frame/system_menu_insertion_delegate_win.h',
       'browser/ui/views/frame/system_menu_model_builder.cc',
       'browser/ui/views/frame/system_menu_model_builder.h',
       'browser/ui/views/frame/system_menu_model_delegate.cc',
       'browser/ui/views/frame/system_menu_model_delegate.h',
+      'browser/ui/views/frame/taskbar_decorator.cc',
+      'browser/ui/views/frame/taskbar_decorator.h',
       'browser/ui/views/frame/taskbar_decorator_win.cc',
       'browser/ui/views/frame/top_container_view.cc',
       'browser/ui/views/frame/top_container_view.h',
       'browser/ui/views/frame/web_contents_close_handler.cc',
       'browser/ui/views/frame/web_contents_close_handler.h',
       'browser/ui/views/frame/web_contents_close_handler_delegate.h',
       'browser/ui/views/global_error_bubble_view.cc',
       'browser/ui/views/global_error_bubble_view.h',
+      'browser/ui/views/hung_renderer_view.cc',
+      'browser/ui/views/hung_renderer_view.h',
       'browser/ui/views/importer/import_lock_dialog_view.cc',
       'browser/ui/views/importer/import_lock_dialog_view.h',
       'browser/ui/views/infobars/alternate_nav_infobar_view.cc',
       'browser/ui/views/infobars/alternate_nav_infobar_view.h',
+      'browser/ui/views/infobars/confirm_infobar.cc',
+      'browser/ui/views/infobars/confirm_infobar.h',
       'browser/ui/views/infobars/infobar_background.cc',
       'browser/ui/views/infobars/infobar_background.h',
       'browser/ui/views/infobars/infobar_container_view.cc',
       'browser/ui/views/infobars/infobar_container_view.h',
       'browser/ui/views/infobars/infobar_view.cc',
       'browser/ui/views/infobars/infobar_view.h',
       'browser/ui/views/load_complete_listener.cc',
       'browser/ui/views/load_complete_listener.h',
       'browser/ui/views/location_bar/bubble_icon_view.cc',
       'browser/ui/views/location_bar/bubble_icon_view.h',
@@ skipping 51 matching lines @@
       'browser/ui/views/panels/panel_frame_view.cc',
       'browser/ui/views/panels/panel_frame_view.h',
       'browser/ui/views/panels/panel_stack_view.cc',
       'browser/ui/views/panels/panel_stack_view.h',
       'browser/ui/views/panels/panel_view.cc',
       'browser/ui/views/panels/panel_view.h',
       'browser/ui/views/panels/taskbar_window_thumbnailer_win.cc',
       'browser/ui/views/panels/taskbar_window_thumbnailer_win.h',
       'browser/ui/views/panels/x11_panel_resizer.cc',
       'browser/ui/views/panels/x11_panel_resizer.h',
+      'browser/ui/views/passwords/credentials_item_view.cc',
+      'browser/ui/views/passwords/credentials_item_view.h',
+      'browser/ui/views/passwords/manage_credential_item_view.cc',
+      'browser/ui/views/passwords/manage_credential_item_view.h',
+      'browser/ui/views/passwords/manage_password_items_view.cc',
+      'browser/ui/views/passwords/manage_password_items_view.h',
+      'browser/ui/views/passwords/manage_passwords_bubble_view.cc',
+      'browser/ui/views/passwords/manage_passwords_bubble_view.h',
+      'browser/ui/views/passwords/manage_passwords_icon_view.cc',
+      'browser/ui/views/passwords/manage_passwords_icon_view.h',
       'browser/ui/views/pdf_password_dialog.cc',
       'browser/ui/views/process_singleton_dialog_linux.cc',
       'browser/ui/views/profiles/avatar_menu_bubble_view.cc',
       'browser/ui/views/profiles/avatar_menu_bubble_view.h',
       'browser/ui/views/profiles/avatar_menu_button.cc',
       'browser/ui/views/profiles/avatar_menu_button.h',
       'browser/ui/views/profiles/new_avatar_button.cc',
       'browser/ui/views/profiles/new_avatar_button.h',
       'browser/ui/views/profiles/profile_chooser_view.cc',
       'browser/ui/views/profiles/profile_chooser_view.h',
       'browser/ui/views/profiles/profile_reset_bubble_view.cc',
       'browser/ui/views/profiles/profile_reset_bubble_view.h',
       'browser/ui/views/profiles/supervised_user_avatar_label.cc',
       'browser/ui/views/profiles/supervised_user_avatar_label.h',
       'browser/ui/views/profiles/user_manager_view.cc',
       'browser/ui/views/profiles/user_manager_view.h',
       'browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc',
       'browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.h',
-      'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
-      'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
       'browser/ui/views/sad_tab_view.cc',
       'browser/ui/views/sad_tab_view.h',
       'browser/ui/views/session_crashed_bubble_view.cc',
       'browser/ui/views/session_crashed_bubble_view.h',
       'browser/ui/views/settings_api_bubble_helper_views.cc',
       'browser/ui/views/settings_api_bubble_helper_views.h',
       'browser/ui/views/signed_certificate_timestamp_info_view.cc',
       'browser/ui/views/signed_certificate_timestamp_info_view.h',
       'browser/ui/views/signed_certificate_timestamps_views.cc',
       'browser/ui/views/signed_certificate_timestamps_views.h',
       'browser/ui/views/simple_message_box_views.cc',
       'browser/ui/views/ssl_client_certificate_selector.cc',
       'browser/ui/views/ssl_client_certificate_selector.h',
       'browser/ui/views/status_bubble_views.cc',
       'browser/ui/views/status_bubble_views.h',
       'browser/ui/views/status_icons/status_icon_win.cc',
       'browser/ui/views/status_icons/status_icon_win.h',
       'browser/ui/views/status_icons/status_tray_linux.cc',
       'browser/ui/views/status_icons/status_tray_linux.h',
       'browser/ui/views/status_icons/status_tray_state_changer_win.cc',
       'browser/ui/views/status_icons/status_tray_state_changer_win.h',
       'browser/ui/views/status_icons/status_tray_win.cc',
       'browser/ui/views/status_icons/status_tray_win.h',
       'browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc',
       'browser/ui/views/sync/profile_signin_confirmation_dialog_views.h',
-      'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc',
-      'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
+      'browser/ui/views/tab_dialogs_views.cc',
+      'browser/ui/views/tab_dialogs_views.h',
       'browser/ui/views/tab_icon_view.cc',
       'browser/ui/views/tab_icon_view.h',
       'browser/ui/views/tab_modal_confirm_dialog_views.cc',
       'browser/ui/views/tab_modal_confirm_dialog_views.h',
+      'browser/ui/views/tabs/browser_tab_strip_controller.cc',
+      'browser/ui/views/tabs/browser_tab_strip_controller.h',
+      'browser/ui/views/tabs/media_indicator_button.cc',
+      'browser/ui/views/tabs/media_indicator_button.h',
+      'browser/ui/views/tabs/stacked_tab_strip_layout.cc',
+      'browser/ui/views/tabs/stacked_tab_strip_layout.h',
+      'browser/ui/views/tabs/tab.cc',
+      'browser/ui/views/tabs/tab.h',
+      'browser/ui/views/tabs/tab_controller.h',
+      'browser/ui/views/tabs/tab_drag_controller.cc',
+      'browser/ui/views/tabs/tab_drag_controller.h',
+      'browser/ui/views/tabs/tab_strip.cc',
+      'browser/ui/views/tabs/tab_strip.h',
+      'browser/ui/views/tabs/tab_strip_controller.h',
+      'browser/ui/views/tabs/window_finder.h',
+      'browser/ui/views/tabs/window_finder_chromeos.cc',
+      'browser/ui/views/tabs/window_finder_mac.mm',
+      'browser/ui/views/tabs/window_finder_win.cc',
       'browser/ui/views/theme_image_mapper.cc',
       'browser/ui/views/theme_image_mapper.h',
+      'browser/ui/views/toolbar/back_button.cc',
+      'browser/ui/views/toolbar/back_button.h',
+      'browser/ui/views/toolbar/browser_action_test_util_views.cc',
+      'browser/ui/views/toolbar/browser_actions_container.cc',
+      'browser/ui/views/toolbar/browser_actions_container.h',
+      'browser/ui/views/toolbar/browser_actions_container_observer.h',
+      'browser/ui/views/toolbar/chevron_menu_button.cc',
+      'browser/ui/views/toolbar/chevron_menu_button.h',
+      'browser/ui/views/toolbar/extension_toolbar_menu_view.cc',
+      'browser/ui/views/toolbar/extension_toolbar_menu_view.h',
+      'browser/ui/views/toolbar/home_button.cc',
+      'browser/ui/views/toolbar/home_button.h',
+      'browser/ui/views/toolbar/reload_button.cc',
+      'browser/ui/views/toolbar/reload_button.h',
+      'browser/ui/views/toolbar/toolbar_action_view.cc',
+      'browser/ui/views/toolbar/toolbar_action_view.h',
+      'browser/ui/views/toolbar/toolbar_action_view_delegate_views.h',
+      'browser/ui/views/toolbar/toolbar_button.cc',
+      'browser/ui/views/toolbar/toolbar_button.h',
+      'browser/ui/views/toolbar/toolbar_view.cc',
+      'browser/ui/views/toolbar/toolbar_view.h',
+      'browser/ui/views/toolbar/wrench_menu.cc',
+      'browser/ui/views/toolbar/wrench_menu.h',
+      'browser/ui/views/toolbar/wrench_menu_observer.h',
+      'browser/ui/views/toolbar/wrench_toolbar_button.cc',
+      'browser/ui/views/toolbar/wrench_toolbar_button.h',
       'browser/ui/views/touch_uma/touch_uma.h',
       'browser/ui/views/translate/translate_bubble_view.cc',
       'browser/ui/views/translate/translate_bubble_view.h',
       'browser/ui/views/update_recommended_message_box.cc',
       'browser/ui/views/update_recommended_message_box.h',
       'browser/ui/views/validation_message_bubble_delegate.cc',
       'browser/ui/views/validation_message_bubble_delegate.h',
       'browser/ui/views/validation_message_bubble_view.cc',
       'browser/ui/views/validation_message_bubble_view.h',
       'browser/ui/views/web_contents_modal_dialog_manager_views.cc',
       '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/permissions_bubble_view.cc',
       'browser/ui/views/website_settings/permissions_bubble_view.h',
       'browser/ui/views/website_settings/website_settings_popup_view.cc',
       'browser/ui/views/website_settings/website_settings_popup_view.h',
     ],
+    # Views files for everywhere but ChromeOS.
+    'chrome_browser_ui_views_non_chromeos_sources': [

[tapted, 2015/03/06 02:38:57]

nit: maybe move this up to line ~1867 for a cleaner diff. (if it really does
belong down here, we can do a follow-up with just the move)

[Andre, 2015/03/06 18:34:39]

Done.

+      'browser/ui/views/chrome_views_delegate_aura.cc',
+      'browser/ui/views/external_protocol_dialog.cc',
+      'browser/ui/views/external_protocol_dialog.h',
+      'browser/ui/views/frame/desktop_browser_frame_aura.cc',
+      'browser/ui/views/frame/desktop_browser_frame_aura.h',
+      'browser/ui/views/message_center/message_center_frame_view.cc',
+      'browser/ui/views/message_center/message_center_frame_view.h',
+      'browser/ui/views/message_center/message_center_widget_delegate.cc',
+      'browser/ui/views/message_center/message_center_widget_delegate.h',
+      'browser/ui/views/message_center/web_notification_tray.cc',
+      'browser/ui/views/message_center/web_notification_tray.h',
+      'browser/ui/views/message_center/web_notification_tray_win.cc',
+      'browser/ui/views/screen_capture_notification_ui_views.cc',
+    ],
+    # Views files everywhere but Mac.
+    'chrome_browser_ui_views_non_mac_sources': [

[tapted, 2015/03/06 02:38:57]

What's special about this list? E.g. is it just the views stuff that doesn't
compile yet on Mac, or will it never belong on Mac. If the former, there should
be a TODO(..) move to foo. If it's the latter, maybe it can go in _aura_sources.

[Andre, 2015/03/06 18:34:39]

Done, _aura_sources is a good place for them.

+      'browser/ui/views/crypto_module_password_dialog_view.cc',
+      'browser/ui/views/crypto_module_password_dialog_view.h',
+      'browser/ui/views/desktop_media_picker_views.cc',
+      'browser/ui/views/desktop_media_picker_views.h',
+      'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
+      'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
+      'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc',
+      'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
+    ],
     # MacViews sources that we still want to keep behind a compile-time flag.
     # TODO(jackhou): Move items to chrome_browser_ui_views_sources when they
     # migrate from mac_views_browser to a chrome://flag.
     'chrome_browser_ui_views_mac_experimental_sources': [
       'browser/ui/views/apps/chrome_app_window_client_views_mac.mm',
       'browser/ui/views/apps/chrome_native_app_window_views_mac.h',
       'browser/ui/views/apps/chrome_native_app_window_views_mac.mm',
     ],
     # Windows-only. Assume ash/aura/views.
     'chrome_browser_ui_win_sources': [
@@ skipping 537 matching lines @@
             ['chromeos == 0 and OS!="mac"', {
               'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ],
             }],
             ['use_ash == 1', {
               'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ],
             }],
             ['OS=="mac"', {
               'conditions': [
                 ['mac_views_browser==1', {
                   'sources': [
+                    '<@(chrome_browser_ui_views_browser_sources)',
                     '<@(chrome_browser_ui_views_mac_experimental_sources)',
                   ],
                   'sources!': [
                     'browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm',
+                    'browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm',
+                    'browser/ui/cocoa/autofill/generated_credit_card_bubble_cocoa.mm',
+                    'browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.mm',
                     'browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm',
                     'browser/ui/cocoa/browser_window_factory_cocoa.mm',
+                    'browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm',
+                    'browser/ui/cocoa/extensions/browser_action_test_util_mac.mm',
+                    'browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm',
+                    'browser/ui/cocoa/extensions/extension_install_dialog_controller.mm',
+                    'browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm',
+                    'browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm',
+                    'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm',
+                    'browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm',
                     'browser/ui/cocoa/infobars/confirm_infobar_controller.mm',
+                    'browser/ui/cocoa/login_prompt_cocoa.mm',
+                    'browser/ui/cocoa/panels/panel_stack_window_cocoa.mm',
+                    'browser/ui/cocoa/simple_message_box_mac.mm',
+                    'browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.cc',
+                    'browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm',
                     'browser/ui/cocoa/tab_dialogs_cocoa.mm',
+                    'browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm',
+                    'browser/ui/cocoa/task_manager_mac.mm',
+                    'browser/ui/cocoa/web_dialog_window_controller.mm',
                   ],
                   'dependencies': [
                     '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
                   ],
-                }, {
-                  'sources!': [
-                    'browser/ui/views/apps/chrome_native_app_window_views.cc',
-                    'browser/ui/views/apps/chrome_native_app_window_views.h',
-                    'browser/ui/views/apps/desktop_keyboard_capture.cc',
-                    'browser/ui/views/apps/desktop_keyboard_capture.h',
-                    'browser/ui/views/apps/keyboard_hook_handler.cc',
-                    'browser/ui/views/apps/keyboard_hook_handler.h',
-                    'browser/ui/views/bookmarks/bookmark_drag_drop_views.cc',
-                    'browser/ui/views/extensions/extension_keybinding_registry_views.cc',
-                    'browser/ui/views/extensions/extension_keybinding_registry_views.h',
-                    'browser/ui/views/frame/browser_window_factory.cc',
-                    'browser/ui/views/frame/taskbar_decorator.cc',
-                    'browser/ui/views/frame/taskbar_decorator.h',
-                    'browser/ui/views/infobar/confirm_infobar.cc'
-                    'browser/ui/views/tab_dialogs_views.cc',
-                  ],
                 }],
               ],
-            }, {
-              'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ],
+            }, {  # non-Mac.
+              'sources': [
+                '<@(chrome_browser_ui_views_browser_sources)',
+                '<@(chrome_browser_ui_views_non_mac_sources)',
+              ],
               'dependencies': [
                 '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
               ],
             }],
           ],
         }],
         ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', {
           'dependencies': [
             # gtk2 is the only component that can interact with gtk2 in our new
             # world.
@@ skipping 47 matching lines @@
           ],
           'dependencies!': [
              '../components/components.gyp:feedback_proto',
              '../ui/events/events.gyp:events',
              'chrome_browser_ui_views.gyp:browser_ui_views',
           ],
           'sources': [ '<@(chrome_browser_ui_android_sources)' ],
         }],
         ['OS=="mac"', {
           'sources': [ '<@(chrome_browser_ui_mac_sources)' ],
-          'sources!': [
-            # Task manager has its own sources list. Leave out the views one.
-            'browser/ui/views/task_manager_view.cc',
-          ],
           'dependencies': [
             '../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample_code',
             '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
             '../third_party/molokocacao/molokocacao.gyp:molokocacao',
             '../third_party/mozilla/mozilla.gyp:mozilla',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Quartz.framework',
             ],
@@ skipping 178 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }