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..57a5099ad9955e1def2b653e7730c75f1b6ab2fb 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
@@ -9,7 +9,6 @@
 #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"
@@ -23,6 +22,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 +34,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,13 +181,7 @@ ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() {
 }
 
 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {
-#if defined(OS_WIN)
-  return CreateWindowsSystemTrayDelegate();
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  return CreateLinuxSystemTrayDelegate();
-#else
-  return new ash::DefaultSystemTrayDelegate;
-#endif
+  return new SystemTrayDelegateCommon();
 }
 
 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() {