[Mac] Use chrome_native_app_window_views when mac_views_browser is enabled.

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 1320 matching lines @@
     ],
     # Files used on iOS. iOS uses only these files and does not share other
     # lists, so a file may appear here and in the non_ios_sources also.
     'chrome_browser_ui_ios_sources': [
       'browser/ui/profile_error_dialog.cc',
       'browser/ui/profile_error_dialog.h',
     ],
     # Counts desktop Linux and ChromeOS.
     'chrome_browser_ui_linux_sources': [
       'browser/ui/startup/autolaunch_prompt.cc',
-      'browser/ui/views/apps/chrome_apps_client_views.cc',
-      'browser/ui/views/apps/keyboard_hook_handler.cc',
       'browser/ui/webui/certificate_viewer_ui.cc',
       'browser/ui/webui/certificate_viewer_ui.h',
       'browser/ui/webui/certificate_viewer_webui.cc',
       'browser/ui/webui/certificate_viewer_webui.h',
     ],
     'chrome_browser_ui_mac_sources': [
       'browser/ui/startup/autolaunch_prompt.cc',
       'browser/ui/web_contents_sizer.mm',
     ],
     'chrome_browser_ui_non_mac_sources': [
@@ skipping 475 matching lines @@
       'browser/ui/window_sizer/window_sizer.h',
     ],
     # Cross-platform views sources also ready for toolkit-views on Mac.
     '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_apps_client_views.cc',
+      '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_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',
@@ skipping 77 matching lines @@
       'browser/ui/views/apps/app_info_dialog/app_info_panel.h',
       'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h',
       'browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h',
       'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc',
       'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h',
       'browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc',
       'browser/ui/views/apps/app_window_desktop_window_tree_host_win.h',
       'browser/ui/views/apps/chrome_apps_client_views_win.cc',
-      'browser/ui/views/apps/chrome_native_app_window_views.cc',
-      'browser/ui/views/apps/chrome_native_app_window_views.h',
       'browser/ui/views/apps/chrome_native_app_window_views_win.cc',
       'browser/ui/views/apps/chrome_native_app_window_views_win.h',
-      'browser/ui/views/apps/desktop_keyboard_capture.cc',
-      'browser/ui/views/apps/desktop_keyboard_capture.h',
       'browser/ui/views/apps/glass_app_window_frame_view_win.cc',
       'browser/ui/views/apps/glass_app_window_frame_view_win.h',
-      'browser/ui/views/apps/keyboard_hook_handler.h',
       'browser/ui/views/apps/keyboard_hook_handler_win.cc',
       'browser/ui/views/apps/shaped_app_window_targeter.cc',
       'browser/ui/views/apps/shaped_app_window_targeter.h',
       'browser/ui/views/ash/tab_scrubber.cc',
       'browser/ui/views/ash/tab_scrubber.h',
       'browser/ui/views/auto_keep_alive.cc',
       'browser/ui/views/auto_keep_alive.h',
       'browser/ui/views/autofill/autofill_dialog_views.cc',
       'browser/ui/views/autofill/autofill_dialog_views.h',
       'browser/ui/views/autofill/autofill_popup_base_view.cc',
@@ skipping 91 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_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',
@@ skipping 47 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/importer/import_lock_dialog_view.cc',
       'browser/ui/views/importer/import_lock_dialog_view.h',
@@ skipping 684 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!': [
+                    'browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm',
                     'browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm',
                     'browser/ui/cocoa/browser_window_factory_cocoa.mm',
                     'browser/ui/cocoa/infobars/confirm_infobar_controller.mm',
                     'browser/ui/cocoa/tab_dialogs_cocoa.mm',
                   ],
+                  'dependencies': [
+                    '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
+                  ],
                 }, {
                   'sources!': [
+                    'browser/ui/views/apps/chrome_apps_client_views.cc',

[tapted, 2015/02/20 07:50:30]

These lists in `conditions` need to be duplicated in the BUILD.gn files as well.

An alternative is to make a variable, but I'd say this is experimental enough
that it doesn't deserve one (it's already a bit tough deciding exactly which
variable above a new file should go into...)

[jackhou1, 2015/02/26 04:35:16]

Done.

+                    '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)' ],
               'dependencies': [
                 '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
               ],
@@ skipping 120 matching lines @@
             '../ui/app_list/app_list.gyp:app_list',
             '../ui/views/controls/webview/webview.gyp:webview',
             '../ui/views/views.gyp:views',
           ],
           'export_dependent_settings': [
             '../ui/views/controls/webview/webview.gyp:webview',
             '../ui/views/views.gyp:views',
           ],
           'sources': [ '<@(chrome_browser_ui_win_sources)' ],
           'sources!': [
+            'browser/ui/views/apps/chrome_apps_client_views.cc',
+            'browser/ui/views/apps/keyboard_hook_handler.cc',
             'browser/ui/views/frame/taskbar_decorator.cc'
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '<(allocator_target)',
               ],
             }],
           ],
         }, {  # 'OS!="win"
@@ skipping 115 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }