Revert 162377 - Move Ash system network trays to ash/system/chromeos

###
Reason:
52>system\chromeos\tray_display.cc(56): error C2039: 'output_configurator' : is not a member of 'ash::Shell'
52>          ..\ash/shell.h(116) : see declaration of 'ash::Shell'
52>system\chromeos\tray_display.cc(56): error C2227: left of '->output_state' must point to class/struct/union/generic type
52>system\chromeos\tray_display.cc(122): error C2039: 'output_configurator' : is not a member of 'ash::Shell'
52>          ..\ash/shell.h(116) : see declaration of 'ash::Shell'
52>system\chromeos\tray_display.cc(122): error C2227: left of '->AddObserver' must point to class/struct/union/generic type
52>system\chromeos\tray_display.cc(127): error C2039: 'output_configurator' : is not a member of 'ash::Shell'
52>          ..\ash/shell.h(116) : see declaration of 'ash::Shell'
52>system\chromeos\tray_display.cc(127): error C2227: left of '->RemoveObserver' must point to class/struct/union/generic type
###

Also adds DEPS to keep chromeos dependencies out of ash/system

This is part of an effort to move chromeos network management code from src/chrome/ to src/chromeos.

BUG=154856

Review URL: https://chromiumcodereview.appspot.com/11039034

TBR=stevenjb@chromium.org

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

15 files changed, 82 insertions, 75 deletions

diff --git a/ash/ash.gyp b/ash/ash.gyp
index bbaad34..837402bf 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -160,13 +160,6 @@
         'system/brightness/brightness_control_delegate.h',
         'system/brightness/tray_brightness.cc',
         'system/brightness/tray_brightness.h',
-        'system/chromeos/network/network_observer.h',
-        'system/chromeos/network/tray_network.cc',
-        'system/chromeos/network/tray_network.h',
-        'system/chromeos/network/tray_sms.cc',
-        'system/chromeos/network/tray_sms.h',
-        'system/chromeos/tray_display.cc',
-        'system/chromeos/tray_display.h',
         'system/date/clock_observer.h',
         'system/date/date_view.cc',
         'system/date/date_view.h',
@@ -181,6 +174,11 @@
         'system/keyboard_brightness/keyboard_brightness_control_delegate.h',
         'system/locale/tray_locale.cc',
         'system/locale/tray_locale.h',
+        'system/network/network_observer.h',
+        'system/network/tray_network.cc',
+        'system/network/tray_network.h',
+        'system/network/tray_sms.cc',
+        'system/network/tray_sms.h',
         'system/power/power_status_observer.h',
         'system/power/power_status_view.cc',
         'system/power/power_status_view.h',
@@ -230,6 +228,8 @@
         'system/tray_accessibility.h',
         'system/tray_caps_lock.cc',
         'system/tray_caps_lock.h',
+        'system/tray_display.cc',
+        'system/tray_display.h',
         'system/tray_update.cc',
         'system/tray_update.h',
         'system/user/login_status.h',
diff --git a/ash/system/DEPS b/ash/system/DEPS
deleted file mode 100644
index abf5b5f..0000000
--- a/ash/system/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "-chromeos",
-]
diff --git a/ash/system/chromeos/DEPS b/ash/system/chromeos/DEPS
deleted file mode 100644
index 79b8e8b..0000000
--- a/ash/system/chromeos/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+chromeos",
-]
diff --git a/ash/system/chromeos/network/network_observer.h b/ash/system/network/network_observer.h
index 6ecc242..2a27b6d 100644
--- a/ash/system/chromeos/network/network_observer.h
+++ b/ash/system/network/network_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_OBSERVER_H
-#define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_OBSERVER_H
+#ifndef ASH_SYSTEM_NETWORK_NETWORK_OBSERVER_H
+#define ASH_SYSTEM_NETWORK_NETWORK_OBSERVER_H
 
 #include <vector>
 
@@ -40,10 +40,10 @@ class NetworkObserver {
   // message. |delegate|->NotificationLinkClicked() will be called if any of the
   // |links| are clicked (if supplied, |links| may be empty).
   virtual void SetNetworkMessage(NetworkTrayDelegate* delegate,
-                                 MessageType message_type,
-                                 const string16& title,
-                                 const string16& message,
-                                 const std::vector<string16>& links) = 0;
+                                MessageType message_type,
+                                const string16& title,
+                                const string16& message,
+                                const std::vector<string16>& links) = 0;
   // Clears the message notification for |message_type|.
   virtual void ClearNetworkMessage(MessageType message_type) = 0;
 
@@ -55,4 +55,4 @@ class NetworkObserver {
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_OBSERVER_H
+#endif  // ASH_SYSTEM_NETWORK_NETWORK_OBSERVER_H
diff --git a/ash/system/chromeos/network/sms_observer.h b/ash/system/network/sms_observer.h
index bc54967..d9b317f 100644
--- a/ash/system/chromeos/network/sms_observer.h
+++ b/ash/system/network/sms_observer.h
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_SMS_OBSERVER_H
-#define ASH_SYSTEM_CHROMEOS_NETWORK_SMS_OBSERVER_H
+#ifndef ASH_SYSTEM_NETWORK_SMS_OBSERVER_H
+#define ASH_SYSTEM_NETWORK_SMS_OBSERVER_H
+
+#include "base/string16.h"
 
 namespace base {
 class DictionaryValue;
@@ -23,4 +25,4 @@ class SmsObserver {
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_SMS_OBSERVER_H
+#endif  // ASH_SYSTEM_NETWORK_SMS_OBSERVER_H
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/network/tray_network.cc
index 8f2a9cf..7769e54 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/network/tray_network.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/chromeos/network/tray_network.h"
+#include "ash/system/network/tray_network.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
diff --git a/ash/system/chromeos/network/tray_network.h b/ash/system/network/tray_network.h
index 271c87c..b4d7e08 100644
--- a/ash/system/chromeos/network/tray_network.h
+++ b/ash/system/network/tray_network.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
-#define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
+#ifndef ASH_SYSTEM_NETWORK_TRAY_NETWORK_H
+#define ASH_SYSTEM_NETWORK_TRAY_NETWORK_H
 
-#include "ash/system/chromeos/network/network_observer.h"
+#include "ash/system/network/network_observer.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "base/memory/scoped_ptr.h"
 
@@ -77,4 +77,4 @@ class TrayNetwork : public SystemTrayItem,
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
+#endif  // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H
diff --git a/ash/system/chromeos/network/tray_sms.cc b/ash/system/network/tray_sms.cc
index 65ff9c6..7aca24f 100644
--- a/ash/system/chromeos/network/tray_sms.cc
+++ b/ash/system/network/tray_sms.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/chromeos/network/tray_sms.h"
+#include "ash/system/network/tray_sms.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
diff --git a/ash/system/chromeos/network/tray_sms.h b/ash/system/network/tray_sms.h
index 41501a3..198557e 100644
--- a/ash/system/chromeos/network/tray_sms.h
+++ b/ash/system/network/tray_sms.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H
-#define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H
+#ifndef ASH_SYSTEM_NETWORK_TRAY_SMS_H
+#define ASH_SYSTEM_NETWORK_TRAY_SMS_H
 
 #include <string>
 
-#include "ash/system/chromeos/network/sms_observer.h"
+#include "ash/system/network/sms_observer.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "base/values.h"
 
@@ -62,4 +62,4 @@ class TraySms : public SystemTrayItem,
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H
+#endif  // ASH_SYSTEM_NETWORK_TRAY_SMS_H
diff --git a/ash/system/power/DEPS b/ash/system/power/DEPS
deleted file mode 100644
index 69b8167..0000000
--- a/ash/system/power/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  # TODO(stevenjb): Move this code to src/ash/system/chromeos, crbug.com/154842
-  "+chromeos/dbus/power_supply_status.h",
-]
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index 769ec6c..59f91a7 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -9,6 +9,7 @@
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
+#include "ash/system/network/network_observer.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ -200,14 +201,30 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
 
   virtual void ToggleWifi() OVERRIDE {
     wifi_enabled_ = !wifi_enabled_;
+    ash::NetworkObserver* observer =
+        ash::Shell::GetInstance()->system_tray()->network_observer();
+    if (observer) {
+      ash::NetworkIconInfo info;
+      observer->OnNetworkRefresh(info);
+    }
   }
 
   virtual void ToggleMobile() OVERRIDE {
     cellular_enabled_ = !cellular_enabled_;
+    ash::NetworkObserver* observer =
+        ash::Shell::GetInstance()->system_tray()->network_observer();
+    if (observer) {
+      ash::NetworkIconInfo info;
+      observer->OnNetworkRefresh(info);
+    }
   }
 
   virtual void ToggleBluetooth() OVERRIDE {
     bluetooth_enabled_ = !bluetooth_enabled_;
+    ash::BluetoothObserver* observer =
+        ash::Shell::GetInstance()->system_tray()->bluetooth_observer();
+    if (observer)
+      observer->OnBluetoothRefresh();
   }
 
   virtual void ShowOtherWifi() OVERRIDE {
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 4411e23..56b7e9c 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -10,11 +10,12 @@
 #include "ash/system/audio/tray_volume.h"
 #include "ash/system/bluetooth/tray_bluetooth.h"
 #include "ash/system/brightness/tray_brightness.h"
-#include "ash/system/chromeos/tray_display.h"
 #include "ash/system/date/tray_date.h"
 #include "ash/system/drive/tray_drive.h"
 #include "ash/system/ime/tray_ime.h"
 #include "ash/system/locale/tray_locale.h"
+#include "ash/system/network/tray_network.h"
+#include "ash/system/network/tray_sms.h"
 #include "ash/system/power/power_status_observer.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/power/tray_power.h"
@@ -26,6 +27,7 @@
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/tray_caps_lock.h"
+#include "ash/system/tray_display.h"
 #include "ash/system/tray_update.h"
 #include "ash/system/user/login_status.h"
 #include "ash/system/user/tray_user.h"
@@ -47,11 +49,6 @@
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
-#if defined(OS_CHROMEOS)
-#include "ash/system/chromeos/network/tray_network.h"
-#include "ash/system/chromeos/network/tray_sms.h"
-#endif
-
 namespace ash {
 
 // SystemTray
@@ -70,10 +67,7 @@ SystemTray::SystemTray(internal::StatusAreaWidget* status_area_widget)
       drive_observer_(NULL),
       ime_observer_(NULL),
       locale_observer_(NULL),
-#if defined(OS_CHROMEOS)
       network_observer_(NULL),
-      sms_observer_(NULL),
-#endif
       update_observer_(NULL),
       user_observer_(NULL),
       default_bubble_height_(0),
@@ -96,6 +90,8 @@ void SystemTray::CreateItems() {
   internal::TrayBrightness* tray_brightness = new internal::TrayBrightness();
   internal::TrayDate* tray_date = new internal::TrayDate();
   internal::TrayPower* tray_power = new internal::TrayPower();
+  internal::TrayNetwork* tray_network = new internal::TrayNetwork;
+  internal::TraySms* tray_sms = new internal::TraySms();
   internal::TrayUser* tray_user = new internal::TrayUser;
   internal::TrayAccessibility* tray_accessibility =
       new internal::TrayAccessibility;
@@ -105,6 +101,7 @@ void SystemTray::CreateItems() {
   internal::TrayLocale* tray_locale = new internal::TrayLocale;
   internal::TrayUpdate* tray_update = new internal::TrayUpdate;
   internal::TraySettings* tray_settings = new internal::TraySettings();
+  internal::TrayDisplay* tray_display = new internal::TrayDisplay;
 
   accessibility_observer_ = tray_accessibility;
   audio_observer_ = tray_volume;
@@ -115,32 +112,22 @@ void SystemTray::CreateItems() {
   drive_observer_ = tray_drive;
   ime_observer_ = tray_ime;
   locale_observer_ = tray_locale;
+  network_observer_ = tray_network;
   power_status_observers_.AddObserver(tray_power);
   power_status_observers_.AddObserver(tray_settings);
+  sms_observer_ = tray_sms;
   update_observer_ = tray_update;
   user_observer_ = tray_user;
 
-#if defined(OS_CHROMEOS)
-  internal::TrayDisplay* tray_display = new internal::TrayDisplay;
-  internal::TrayNetwork* tray_network = new internal::TrayNetwork;
-  internal::TraySms* tray_sms = new internal::TraySms();
-  network_observer_ = tray_network;
-  sms_observer_ = tray_sms;
-#endif
-
   AddTrayItem(tray_user);
   AddTrayItem(tray_power);
-#if defined(OS_CHROMEOS)
   AddTrayItem(tray_network);
-  AddTrayItem(tray_sms);
-#endif
   AddTrayItem(tray_bluetooth);
+  AddTrayItem(tray_sms);
   AddTrayItem(tray_drive);
   AddTrayItem(tray_ime);
   AddTrayItem(tray_locale);
-#if defined(OS_CHROMEOS)
   AddTrayItem(tray_display);
-#endif
   AddTrayItem(tray_volume);
   AddTrayItem(tray_brightness);
   AddTrayItem(tray_update);
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index aa03885..760c527 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -30,13 +30,11 @@ class ClockObserver;
 class DriveObserver;
 class IMEObserver;
 class LocaleObserver;
+class NetworkObserver;
+class SmsObserver;
 class PowerStatusObserver;
 class UpdateObserver;
 class UserObserver;
-#if defined(OS_CHROMEOS)
-class NetworkObserver;
-class SmsObserver;
-#endif
 
 class SystemTrayItem;
 
@@ -135,17 +133,15 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
   LocaleObserver* locale_observer() const {
     return locale_observer_;
   }
-#if defined(OS_CHROMEOS)
   NetworkObserver* network_observer() const {
     return network_observer_;
   }
-  SmsObserver* sms_observer() const {
-    return sms_observer_;
-  }
-#endif
   ObserverList<PowerStatusObserver>& power_status_observers() {
     return power_status_observers_;
   }
+  SmsObserver* sms_observer() const {
+    return sms_observer_;
+  }
   UpdateObserver* update_observer() const {
     return update_observer_;
   }
@@ -220,11 +216,9 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
   DriveObserver* drive_observer_;
   IMEObserver* ime_observer_;
   LocaleObserver* locale_observer_;
-#if defined(OS_CHROMEOS)
   NetworkObserver* network_observer_;
-  SmsObserver* sms_observer_;
-#endif
   ObserverList<PowerStatusObserver> power_status_observers_;
+  SmsObserver* sms_observer_;
   UpdateObserver* update_observer_;
   UserObserver* user_observer_;
 
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/tray_display.cc
index 0e672d1..66c9952 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/tray_display.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/chromeos/tray_display.h"
+#include "ash/system/tray_display.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/screen_ash.h"
@@ -53,6 +53,7 @@ class DisplayView : public ash::internal::ActionableView {
   virtual ~DisplayView() {}
 
   void Update() {
+#if defined(OS_CHROMEOS)
     switch (Shell::GetInstance()->output_configurator()->output_state()) {
       case chromeos::STATE_INVALID:
       case chromeos::STATE_HEADLESS:
@@ -96,6 +97,7 @@ class DisplayView : public ash::internal::ActionableView {
       default:
         NOTREACHED();
     }
+#endif  // OS_CHROMEOS
   }
 
  private:
@@ -119,16 +121,22 @@ class DisplayView : public ash::internal::ActionableView {
 TrayDisplay::TrayDisplay()
     : default_(NULL) {
   aura::Env::GetInstance()->display_manager()->AddObserver(this);
+#if defined(OS_CHROMEOS)
   ash::Shell::GetInstance()->output_configurator()->AddObserver(this);
+#endif
 }
 
 TrayDisplay::~TrayDisplay() {
   aura::Env::GetInstance()->display_manager()->RemoveObserver(this);
+#if defined(OS_CHROMEOS)
   ash::Shell::GetInstance()->output_configurator()->RemoveObserver(this);
+#endif
 }
 
 views::View* TrayDisplay::CreateDefaultView(user::LoginStatus status) {
+#if defined(OS_CHROMEOS)
   default_ = new DisplayView(status);
+#endif
   return default_;
 }
 
@@ -151,10 +159,13 @@ void TrayDisplay::OnDisplayRemoved(const gfx::Display& old_display) {
     default_->Update();
 }
 
+#if defined(OS_CHROMEOS)
 void TrayDisplay::OnDisplayModeChanged() {
   if (default_)
     default_->Update();
 }
+#endif
+
 
 }  // namespace internal
 }  // namespace ash
diff --git a/ash/system/chromeos/tray_display.h b/ash/system/tray_display.h
index 77994b6..e969e76 100644
--- a/ash/system/chromeos/tray_display.h
+++ b/ash/system/tray_display.h
@@ -2,14 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
-#define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
+#ifndef ASH_SYSTEM_TRAY_DISPLAY_H_
+#define ASH_SYSTEM_TRAY_DISPLAY_H_
 
 #include "ash/system/tray/system_tray_item.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/display_observer.h"
 
+#if defined(OS_CHROMEOS)
 #include "chromeos/display/output_configurator.h"
+#endif
 
 namespace views {
 class View;
@@ -21,7 +23,9 @@ namespace internal {
 class DisplayView;
 
 class TrayDisplay : public SystemTrayItem,
+#if defined(OS_CHROMEOS)
                     public chromeos::OutputConfigurator::Observer,
+#endif
                     public aura::DisplayObserver {
  public:
   TrayDisplay();
@@ -37,8 +41,10 @@ class TrayDisplay : public SystemTrayItem,
   virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
   virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
 
+#if defined(OS_CHROMEOS)
   // Overridden from chromeos::OutputConfigurator::Observer
   virtual void OnDisplayModeChanged() OVERRIDE;
+#endif
 
   DisplayView* default_;
 
@@ -48,4 +54,4 @@ class TrayDisplay : public SystemTrayItem,
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
+#endif  // ASH_SYSTEM_TRAY_DISPLAY_H_