Ash Flag on Linux: Modified and Renamed Factory Files

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 df312851161a6daa24f9cf97072df18264f1722e..a18388b2fc9ee8e6d9e90500c9976bce217c1fa8 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -626,6 +626,9 @@
       '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/ash/tab_scrubber.cc',
+      'browser/ui/views/ash/tab_scrubber.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',
     ],
@@ -647,10 +650,8 @@
       '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',
@@ -1335,7 +1336,6 @@
       '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',
       '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',
@@ -2105,8 +2105,6 @@
       'browser/ui/views/apps/glass_app_window_frame_view_win.h',
       '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',

[benwells, 2015/12/04 00:42:37]

Some of these changes are unrelated to the factory stuff, so you should split
them otu into the other 'all the trivial stuff' CL.

       'browser/ui/views/auto_keep_alive.cc',
       'browser/ui/views/auto_keep_alive.h',
       'browser/ui/views/autofill/autofill_dialog_views.cc',
@@ -2217,6 +2215,7 @@
       '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',
@@ -2239,6 +2238,7 @@
       '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',