Ash Flag on Linux: Modified and Renamed Factory Files

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 608 matching lines @@
       'browser/ui/ash/system_tray_delegate_common.cc',
       'browser/ui/ash/system_tray_delegate_common.h',
       'browser/ui/ash/system_tray_delegate_utils.cc',
       'browser/ui/ash/system_tray_delegate_utils.h',
       'browser/ui/ash/volume_controller_chromeos.cc',
       'browser/ui/ash/volume_controller_chromeos.h',
       'browser/ui/ash/vpn_delegate_chromeos.cc',
       'browser/ui/ash/vpn_delegate_chromeos.h',
       'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
       'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
+      'browser/ui/views/frame/native_browser_frame_factory_desktop_ash.cc',
       'browser/ui/views/touch_uma/touch_uma_ash.cc',
       'browser/ui/window_sizer/window_sizer_ash.cc',
     ],
     # Used when Ash is enabled but not ChromeOS.
     'chrome_browser_ui_ash_non_chromeos': [
       'browser/ui/ash/chrome_shell_content_state_views.cc',
       'browser/ui/ash/chrome_shell_delegate_views.cc',
       'browser/ui/ash/multi_user/multi_user_context_menu.cc',
       'browser/ui/ash/multi_user/multi_user_context_menu.h',
       'browser/ui/ash/session_state_delegate_views.cc',
       'browser/ui/ash/session_state_delegate_views.h',
       'browser/ui/views/chrome_views_delegate_ash.cc',
     ],
     # Ash + Views.
     'chrome_browser_ui_ash_views_sources': [
       'browser/ui/views/frame/browser_frame_ash.cc',
       'browser/ui/views/frame/browser_frame_ash.h',
       'browser/ui/views/frame/browser_header_painter_ash.cc',
       'browser/ui/views/frame/browser_header_painter_ash.h',
       'browser/ui/views/frame/browser_non_client_frame_view_ash.cc',
       'browser/ui/views/frame/browser_non_client_frame_view_ash.h',
-      'browser/ui/views/frame/browser_non_client_frame_view_factory_ash.cc',
       'browser/ui/views/frame/immersive_mode_controller_ash.cc',
       'browser/ui/views/frame/immersive_mode_controller_ash.h',
-      'browser/ui/views/frame/immersive_mode_controller_factory_ash.cc',
       'browser/ui/views/frame/web_app_left_header_view_ash.cc',
       'browser/ui/views/frame/web_app_left_header_view_ash.h',
       'browser/ui/views/tabs/window_finder_ash.cc',
       'browser/ui/views/tabs/window_finder_impl.cc',
       'browser/ui/views/tabs/window_finder_impl.h',
     ],
     # Used when Android + Views.
     'chrome_browser_ui_views_android_sources': [
       'browser/ui/views/tabs/window_finder_android.cc',
       'browser/ui/views/tabs/window_finder_impl.cc',
@@ skipping 664 matching lines @@
       'browser/ui/views/frame/browser_desktop_window_tree_host.h',
       'browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc',
       'browser/ui/views/frame/browser_desktop_window_tree_host_x11.h',
       'browser/ui/views/frame/desktop_browser_frame_auralinux.cc',
       'browser/ui/views/frame/desktop_browser_frame_auralinux.h',
       'browser/ui/views/frame/global_menu_bar_registrar_x11.cc',
       'browser/ui/views/frame/global_menu_bar_registrar_x11.h',
       'browser/ui/views/frame/global_menu_bar_x11.cc',
       'browser/ui/views/frame/global_menu_bar_x11.h',
       'browser/ui/views/frame/native_browser_frame_factory_auralinux.cc',
-      'browser/ui/views/frame/native_browser_frame_factory_desktop_ash.cc',

[benwells, 2015/12/08 01:48:05]

This file is moving from linux desktop, to all ash.

I don't think that is right .... we might need a new group for linux ash if we
want to keep linux ash compiling ... or something - looking at that file it is
pretty trivial and a little bit confusing.

To move forward with this CL, I think you should remove this change and do it in
a separate patch.

       'browser/ui/views/javascript_app_modal_dialog_views_x11.cc',
       'browser/ui/views/javascript_app_modal_dialog_views_x11.h',
       'browser/ui/views/status_icons/status_icon_linux_wrapper.cc',
       'browser/ui/views/status_icons/status_icon_linux_wrapper.h',
       'browser/ui/webui/help/version_updater_basic.cc',
       'browser/ui/webui/help/version_updater_basic.h',
     ],
     # 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': [
@@ skipping 861 matching lines @@
       'browser/ui/views/frame/browser_frame_android.cc',
       'browser/ui/views/frame/browser_frame_android.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',
       'browser/ui/views/frame/browser_non_client_frame_view_factory_android.cc',
       'browser/ui/views/frame/browser_non_client_frame_view_factory_mac.mm',
+      'browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc',
       'browser/ui/views/frame/browser_non_client_frame_view_mac.h',
       'browser/ui/views/frame/browser_non_client_frame_view_mac.mm',
       'browser/ui/views/frame/browser_root_view.cc',
       'browser/ui/views/frame/browser_root_view.h',
       'browser/ui/views/frame/browser_shutdown.cc',
       'browser/ui/views/frame/browser_shutdown.h',
       'browser/ui/views/frame/browser_view.cc',
       'browser/ui/views/frame/browser_view.h',
       'browser/ui/views/frame/browser_view_layout.cc',
       'browser/ui/views/frame/browser_view_layout.h',
       'browser/ui/views/frame/browser_view_layout_delegate.h',
       'browser/ui/views/frame/browser_window_factory.cc',
       'browser/ui/views/frame/browser_window_property_manager_win.cc',
       'browser/ui/views/frame/browser_window_property_manager_win.h',
       'browser/ui/views/frame/contents_layout_manager.cc',
       'browser/ui/views/frame/contents_layout_manager.h',
       'browser/ui/views/frame/contents_web_view.cc',
       'browser/ui/views/frame/contents_web_view.h',
       'browser/ui/views/frame/immersive_mode_controller.cc',
       'browser/ui/views/frame/immersive_mode_controller.h',
       'browser/ui/views/frame/immersive_mode_controller_factory_android.cc',
       'browser/ui/views/frame/immersive_mode_controller_factory_mac.cc',
+      'browser/ui/views/frame/immersive_mode_controller_factory_views.cc',
       'browser/ui/views/frame/immersive_mode_controller_stub.cc',
       'browser/ui/views/frame/immersive_mode_controller_stub.h',
       'browser/ui/views/frame/minimize_button_metrics_win.cc',
       'browser/ui/views/frame/minimize_button_metrics_win.h',
       'browser/ui/views/frame/native_browser_frame.h',
       'browser/ui/views/frame/native_browser_frame_factory.cc',
       'browser/ui/views/frame/native_browser_frame_factory.h',
       'browser/ui/views/frame/native_browser_frame_factory_android.cc',
       'browser/ui/views/frame/native_browser_frame_factory_chromeos.cc',
       'browser/ui/views/frame/native_browser_frame_factory_mac.mm',
@@ skipping 1023 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }