Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2773)

Unified Diff: ash/system/chromeos/network/tray_network.h

Issue 12218116: Revert 181806 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/chromeos/network/tray_network.h
===================================================================
--- ash/system/chromeos/network/tray_network.h (revision 181895)
+++ ash/system/chromeos/network/tray_network.h (working copy)
@@ -5,18 +5,10 @@
#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
#define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
-#include <set>
-
-#include "ash/system/chromeos/network/network_icon.h"
#include "ash/system/chromeos/network/network_observer.h"
#include "ash/system/tray/system_tray_item.h"
#include "base/memory/scoped_ptr.h"
-#include "base/time.h"
-namespace chromeos {
-class NetworkState;
-}
-
namespace ash {
namespace internal {
@@ -65,28 +57,7 @@
virtual void ClearNetworkMessage(MessageType message_type) OVERRIDE;
virtual void OnWillToggleWifi() OVERRIDE;
- // Called when the network for the tray icon may have been updated.
- void TrayNetworkUpdated();
-
- // Called when the properties for |network| may have been updated.
- void NetworkServiceChanged(const chromeos::NetworkState* network);
-
- // Request a network connection (called from detailed view).
- void ConnectToNetwork(const std::string& service_path);
-
- // Returns true if a user initiated connection to |network| occured.
- bool HasConnectingNetwork(const std::string& service_path);
-
- // Gets the correct icon and label for |icon_type|.
- void GetNetworkStateHandlerImageAndLabel(network_icon::IconType icon_type,
- gfx::ImageSkia* image,
- string16* label);
-
- // Updates and returns the appropriate message id if a network technology
- // (i.e. cellular) is uninitialized.
- int GetUninitializedMsg();
-
-private:
+ private:
friend class tray::NetworkMessageView;
friend class tray::NetworkNotificationView;
@@ -101,9 +72,6 @@
scoped_ptr<tray::NetworkMessages> messages_;
bool request_wifi_view_;
scoped_ptr<TrayNetworkStateObserver> network_state_observer_;
- std::set<std::string> connecting_networks_;
- base::Time uninitialized_state_time_;
- int uninitialized_msg_;
DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
};
« no previous file with comments | « ash/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/system/chromeos/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698