diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 14:31:40 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 14:31:40 +0000 |
| commit | 9abeee5f9efffd8d76762858d2c662f99c9d63f1 (patch) | |
| tree | cad165332d26635b717a2817e5292312a56b92f6 /ash/ash.gyp | |
| parent | 979f7a8ef2b439c4e032ae6d777178f847d63e75 (diff) | |
| download | chromium_src-9abeee5f9efffd8d76762858d2c662f99c9d63f1.zip chromium_src-9abeee5f9efffd8d76762858d2c662f99c9d63f1.tar.gz chromium_src-9abeee5f9efffd8d76762858d2c662f99c9d63f1.tar.bz2 | |
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
Diffstat (limited to 'ash/ash.gyp')
| -rw-r--r-- | ash/ash.gyp | 14 |
1 files changed, 7 insertions, 7 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', |