Common code from linux and windows implementations of SystemTrayDelegate

chrome/browser/ui/ash/chrome_shell_delegate_views.cc

Index: chrome/browser/ui/ash/chrome_shell_delegate_views.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
index c63d4cbc439c902cb7e6c71aa2fd4f20cd6ac674..06e26928646877733ac2643d48544fd352087ed3 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
@@ -23,6 +23,7 @@
 #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"
@@ -34,14 +35,6 @@
 #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 {
@@ -189,12 +182,10 @@ ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() {
 }
 
 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
 }