Common code from linux and windows implementations of SystemTrayDelegate

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 e7ee42a653f13d86a89ebf098573e97c0393486b..159a24cbf51331e99e9128de9ebc07aeb484fa45 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1290,6 +1290,7 @@
     ],
     # Windows-only. Assume ash/aura/views.
     'chrome_browser_ui_win_sources': [
+      'browser/ui/ash/system_tray_delegate_win.cc',

[sky, 2014/10/07 16:01:13]

You should be able to list this in chrome_browser_ui_non_ios_sources and have
the right thing happen.

       'browser/ui/network_profile_bubble.cc',
       'browser/ui/network_profile_bubble.h',
       'browser/ui/views/color_chooser_dialog.cc',
@@ -1305,12 +1306,12 @@
       'browser/ui/views/frame/native_browser_frame_factory_desktop_ash.cc',
       'browser/ui/views/network_profile_bubble_view.cc',
       'browser/ui/views/network_profile_bubble_view.h',
+      'browser/ui/views/uninstall_view.cc',
+      'browser/ui/views/uninstall_view.h',
       'browser/ui/webui/conflicts_ui.cc',
       'browser/ui/webui/conflicts_ui.h',
       'browser/ui/webui/set_as_default_browser_ui.cc',
       'browser/ui/webui/set_as_default_browser_ui.h',
-      'browser/ui/views/uninstall_view.cc',
-      'browser/ui/views/uninstall_view.h',
     ],
     'chrome_browser_ui_mac_sources': [
       'browser/ui/startup/session_crashed_bubble.cc',
@@ -1807,6 +1808,9 @@
       'browser/ui/window_sizer/window_sizer.cc',
       'browser/ui/window_sizer/window_sizer.h',
     ],
+    'chrome_browser_ui_non_linux_win_sources': [
+      'browser/ui/ash/system_tray_delegate_default.cc',
+    ],
     'chrome_browser_ui_print_preview_sources': [
       'browser/ui/webui/print_preview/print_preview_handler.cc',
       'browser/ui/webui/print_preview/print_preview_handler.h',
@@ -2425,12 +2429,10 @@
       'browser/ui/ash/stub_user_accounts_delegate.h',
       'browser/ui/ash/system_tray_delegate_chromeos.cc',
       'browser/ui/ash/system_tray_delegate_chromeos.h',
-      'browser/ui/ash/system_tray_delegate_linux.cc',
-      'browser/ui/ash/system_tray_delegate_linux.h',
+      '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/system_tray_delegate_win.cc',
-      'browser/ui/ash/system_tray_delegate_win.h',
       'browser/ui/ash/user_accounts_delegate_chromeos.cc',
       'browser/ui/ash/user_accounts_delegate_chromeos.h',
       'browser/ui/ash/volume_controller_chromeos.cc',
@@ -2473,6 +2475,7 @@
     ],
     # Counts desktop Linux and ChromeOS.
     'chrome_browser_ui_linux_sources': [
+      'browser/ui/ash/system_tray_delegate_linux.cc',

[sky, 2014/10/07 16:01:13]

I thought we only want this on linux, no-chromeos?

       'browser/ui/startup/autolaunch_prompt.cc',
       'browser/ui/views/apps/chrome_apps_client_views.cc',
       'browser/ui/views/frame/taskbar_decorator.cc',
@@ -2914,6 +2917,9 @@
             }],
           ],
         }],
+        ['OS!="win" and OS!="linux" and OS!="chromeos"', {

[sky, 2014/10/07 16:01:13]

chromeos is not an OS. Is this ever needed? You'll compile this on mac/android,
which we don't want. So, I'm having a hard time seeing when we would want to
compile these files.

+	  'sources': [ '<@(chrome_browser_ui_non_linux_win_sources)' ],
+        }],
         ['desktop_linux==1', {
           'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ],
         }],