Common code from linux and windows implementations of SystemTrayDelegate

chrome/browser/ui/ash/chrome_shell_delegate_views.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/media_delegate.h"
 #include "ash/system/tray/default_system_tray_delegate.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/accessibility/accessibility_events.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h"
 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h"
 #include "chrome/browser/ui/ash/chrome_new_window_delegate.h"
 #include "chrome/browser/ui/ash/session_state_delegate_views.h"
 #include "chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h"
+#include "chrome/browser/ui/ash/system_tray_delegate_common.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 
-#if defined(OS_WIN)
-#include "chrome/browser/ui/ash/system_tray_delegate_win.h"
-#endif
-
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#include "chrome/browser/ui/ash/system_tray_delegate_linux.h"
-#endif
-
 namespace {
 
 class NewWindowDelegateImpl : public ChromeNewWindowDelegate {
  public:
   NewWindowDelegateImpl() {}
   virtual ~NewWindowDelegateImpl() {}
 
   // Overridden from ash::NewWindowDelegate:
   virtual void OpenFileManager() override {}
   virtual void OpenCrosh() override {}
@@ skipping 127 matching lines @@
 
 ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() {
   return new MediaDelegateImpl;
 }
 
 ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() {
   return new SessionStateDelegate;
 }
 
 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {
-#if defined(OS_WIN)
-  return CreateWindowsSystemTrayDelegate();
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  return CreateLinuxSystemTrayDelegate();
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+  return CreateSystemTrayDelegate();
 #else
-  return new ash::DefaultSystemTrayDelegate;
+  return new DefaultSystemTrayDelegate();

[sky, 2014/10/08 15:39:53]

AFAICT the else here is never hit. Am I wrong? Assuming that is the case you can
nuke CreateSystemTrayDelegate() and have this return a
system_tray_delegate_common and nuke default_system_tray_delegate.

[ygorshenin1, 2014/10/09 09:14:44]

ChromeShellDelegate is instantiated and used in all places where ash is enabled,
take a look at
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/....
So probably it would be better to keep old behavior as is, what do you think?

[sky, 2014/10/09 17:22:39]

You made me look. See
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/chrome_brow...
. This file is not built on chromeos.

[ygorshenin1, 2014/10/10 12:02:54]

Done.

 #endif
 }
 
 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() {
   return new EmptyAccessibilityDelegate;
 }
 
 ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() {
   return CreateSolidColorUserWallpaperDelegate();
 }
@@ skipping 76 matching lines @@
                  chrome::NOTIFICATION_PROFILE_ADDED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_ASH_SESSION_STARTED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_ASH_SESSION_ENDED,
                  content::NotificationService::AllSources());
 #endif
 }