Common code from linux and windows implementations of SystemTrayDelegate

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': {
     'chrome_browser_ui_non_ios_sources': [
       'browser/ui/accelerator_utils.h',
       'browser/ui/android/android_about_app_info.cc',
       'browser/ui/android/android_about_app_info.h',
@@ skipping 1272 matching lines @@
     ],
     # For when enable_service_discovery is set.
     'chrome_browser_ui_service_discovery_sources': [
       'browser/ui/webui/local_discovery/local_discovery_ui.cc',
       'browser/ui/webui/local_discovery/local_discovery_ui.h',
       'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
       'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
     ],
     # 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',
       'browser/ui/views/color_chooser_dialog.h',
       'browser/ui/views/frame/browser_desktop_window_tree_host.h',
       'browser/ui/views/frame/browser_desktop_window_tree_host_win.cc',
       'browser/ui/views/frame/browser_desktop_window_tree_host_win.h',
       'browser/ui/views/frame/browser_frame_ashwin.cc',
       'browser/ui/views/frame/browser_frame_ashwin.h',
       'browser/ui/views/frame/glass_browser_frame_view.cc',
       'browser/ui/views/frame/glass_browser_frame_view.h',
       'browser/ui/views/frame/native_browser_frame_factory_aurawin.cc',
       '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',
       'browser/ui/startup/autolaunch_prompt.cc',
       'browser/ui/web_contents_sizer.mm',
     ],
     'chrome_browser_ui_non_mac_sources': [
       'browser/ui/web_contents_sizer.cc',
     ],
     # Files used only on desktop systems (not iOS, Android, ChromeOS).
@@ skipping 476 matching lines @@
       'browser/ui/webui/sync_setup_handler.h',
       'browser/ui/webui/system_info_ui.cc',
       'browser/ui/webui/system_info_ui.h',
       'browser/ui/webui/theme_handler.cc',
       'browser/ui/webui/theme_handler.h',
       'browser/ui/webui/uber/uber_ui.cc',
       'browser/ui/webui/uber/uber_ui.h',
       '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',
       'browser/ui/webui/print_preview/print_preview_ui.cc',
       'browser/ui/webui/print_preview/print_preview_ui.h',
       'browser/ui/webui/print_preview/sticky_settings.cc',
       'browser/ui/webui/print_preview/sticky_settings.h',
     ],
     'chrome_browser_ui_one_click_signin_sources': [
       'browser/ui/cocoa/one_click_signin_bubble_controller.h',
@@ skipping 598 matching lines @@
       'browser/ui/ash/screenshot_taker.cc',
       'browser/ui/ash/screenshot_taker.h',
       'browser/ui/ash/session_state_delegate_chromeos.cc',
       'browser/ui/ash/session_state_delegate_chromeos.h',
       'browser/ui/ash/solid_color_user_wallpaper_delegate.cc',
       'browser/ui/ash/solid_color_user_wallpaper_delegate.h',
       'browser/ui/ash/stub_user_accounts_delegate.cc',
       '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',
       'browser/ui/ash/volume_controller_chromeos.h',
       'browser/ui/views/touch_uma/touch_uma_ash.cc',
       'browser/ui/window_sizer/window_sizer_ash.cc',
     ],
     # Used when ash is disabled.
     'chrome_browser_ui_non_ash_sources': [
       'browser/ui/views/touch_uma/touch_uma.cc',
@@ skipping 22 matching lines @@
     ],
     # Used when athena is enabled.
     'chrome_browser_ui_athena_sources': [
       'browser/ui/views/athena/athena_util.cc',
       'browser/ui/views/athena/athena_util.h',
       'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc',
       'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h',
     ],
     # 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',
       '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',
     ],
     # Desktop Linux. Assume aura/ash/views.
     'chrome_browser_ui_desktop_linux_sources': [
@@ skipping 421 matching lines @@
                 '<(INTERMEDIATE_DIR)/chrome',
               ],
             }, { # else: toolkit_views==0
               'sources/': [
                 # Exclude all of views.
                 ['exclude', '^browser/ui/views/'],
               ]
             }],
           ],
         }],
+        ['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)' ],
         }],
         ['OS=="linux"', {  # Both desktop Linux and ChromeOS.
           'sources': [ '<@(chrome_browser_ui_linux_sources)' ],
           'conditions': [
             ['use_aura==1', {
               'dependencies': [
                 '../build/linux/system.gyp:dbus',
                 '../build/linux/system.gyp:fontconfig',
@@ skipping 78 matching lines @@
         }],
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
           ],
         }],
       ],
     },
   ],
 }