Revert "Revert 239730 "ash_system_tray_delegate -> system_tray_delegate_...""

This reverts 240379..

BUG=311373
TBR=stevenjb

Review URL: https://codereview.chromium.org/126213002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243420 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 21 insertions, 22 deletions

diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.h b/chrome/browser/chromeos/system/ash_system_tray_delegate.h
deleted file mode 100644
index e59728a..0000000
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_ASH_SYSTEM_TRAY_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_ASH_SYSTEM_TRAY_DELEGATE_H_
-
-namespace ash {
-class SystemTray;
-class SystemTrayDelegate;
-}
-
-namespace chromeos {
-ash::SystemTrayDelegate* CreateSystemTrayDelegate();
-}
-
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_ASH_SYSTEM_TRAY_DELEGATE_H_
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index a5c6870..8fdfe73 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -18,12 +18,12 @@
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/chromeos/extensions/media_player_api.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
-#include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/speech/tts_controller.h"
 #include "chrome/browser/ui/ash/caps_lock_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
+#include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index 3fabe83..f230fc5 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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/chromeos/system/ash_system_tray_delegate.h"
+#include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <algorithm>
 #include <set>
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
new file mode 100644
index 0000000..e0d8340
--- /dev/null
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -0,0 +1,16 @@
+// 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.
+
+#ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
+#define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
+
+namespace ash {
+class SystemTrayDelegate;
+}
+
+namespace chromeos {
+ash::SystemTrayDelegate* CreateSystemTrayDelegate();
+}
+
+#endif  // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index feed926..cacd555 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -825,8 +825,6 @@
         'browser/chromeos/status/data_promo_notification.h',
         'browser/chromeos/status/network_menu.cc',
         'browser/chromeos/status/network_menu.h',
-        'browser/chromeos/system/ash_system_tray_delegate.cc',
-        'browser/chromeos/system/ash_system_tray_delegate.h',
         'browser/chromeos/system/automatic_reboot_manager.cc',
         'browser/chromeos/system/automatic_reboot_manager.h',
         'browser/chromeos/system/automatic_reboot_manager_observer.h',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 0605921..1735320 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -338,6 +338,8 @@
         'browser/ui/ash/session_state_delegate_chromeos.h',
         'browser/ui/ash/session_state_delegate_views.cc',
         'browser/ui/ash/session_state_delegate_views.h',
+        'browser/ui/ash/system_tray_delegate_chromeos.cc',
+        'browser/ui/ash/system_tray_delegate_chromeos.h',
         'browser/ui/ash/system_tray_delegate_win.cc',
         'browser/ui/ash/system_tray_delegate_win.h',
         'browser/ui/ash/tabs/dock_info_ash.cc',