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..61f733a6aa8b43d2a804cdeaec9d759b27ddfa94 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1305,12 +1305,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',
@@ -2425,12 +2425,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',