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/system/chromeos/network/network_observer.h | |
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/system/chromeos/network/network_observer.h')
-rw-r--r-- | ash/system/chromeos/network/network_observer.h | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/ash/system/chromeos/network/network_observer.h b/ash/system/chromeos/network/network_observer.h deleted file mode 100644 index 6ecc242..0000000 --- a/ash/system/chromeos/network/network_observer.h +++ /dev/null @@ -1,58 +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 ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_OBSERVER_H -#define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_OBSERVER_H - -#include <vector> - -#include "base/string16.h" - -namespace ash { - -struct NetworkIconInfo; - -class NetworkTrayDelegate { - public: - virtual ~NetworkTrayDelegate() {} - - // Notifies that the |index|-th link on the notification is clicked. - virtual void NotificationLinkClicked(size_t index) = 0; -}; - -class NetworkObserver { - public: - enum MessageType { - // Priority order, highest to lowest. - ERROR_CONNECT_FAILED, - - MESSAGE_DATA_NONE, - MESSAGE_DATA_LOW, - MESSAGE_DATA_PROMO, - }; - - virtual ~NetworkObserver() {} - - virtual void OnNetworkRefresh(const NetworkIconInfo& info) = 0; - - // Sets a network message notification. |message_type| identifies the type of - // 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; - // Clears the message notification for |message_type|. - virtual void ClearNetworkMessage(MessageType message_type) = 0; - - // Called when the user attempted to toggle Wi-Fi enable/disable. - // NOTE: Toggling is asynchronous and subsequent calls to query the current - // state may return the old value. - virtual void OnWillToggleWifi() = 0; -}; - -} // namespace ash - -#endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_OBSERVER_H |