Index: chrome/browser/chromeos/dom_ui/internet_options_handler.h |
=================================================================== |
--- chrome/browser/chromeos/dom_ui/internet_options_handler.h (revision 64886) |
+++ chrome/browser/chromeos/dom_ui/internet_options_handler.h (working copy) |
@@ -16,8 +16,12 @@ |
} |
// ChromeOS internet options page UI handler. |
-class InternetOptionsHandler : public OptionsPageUIHandler, |
- public chromeos::NetworkLibrary::Observer { |
+class InternetOptionsHandler |
+ : public OptionsPageUIHandler, |
+ public chromeos::NetworkLibrary::NetworkManagerObserver, |
+ public chromeos::NetworkLibrary::NetworkObserver, |
+ public chromeos::NetworkLibrary::CellularDataPlanObserver { |
+ |
public: |
InternetOptionsHandler(); |
virtual ~InternetOptionsHandler(); |
@@ -28,9 +32,13 @@ |
// DOMMessageHandler implementation. |
virtual void RegisterMessages(); |
- // NetworkLibrary::Observer implementation. |
- virtual void NetworkChanged(chromeos::NetworkLibrary* obj); |
- virtual void CellularDataPlanChanged(chromeos::NetworkLibrary* obj); |
+ // NetworkLibrary::NetworkManagerObserver implementation. |
+ virtual void OnNetworkManagerChanged(chromeos::NetworkLibrary* network_lib); |
+ // NetworkLibrary::NetworkObserver implementation. |
+ virtual void OnNetworkChanged(chromeos::NetworkLibrary* network_lib, |
+ const chromeos::Network* network); |
+ // NetworkLibrary::CellularDataPlanObserver implementation. |
+ virtual void OnCellularDataPlanChanged(chromeos::NetworkLibrary* network_lib); |
private: |
// Passes data needed to show details overlay for network. |
@@ -81,7 +89,14 @@ |
ListValue* GetWirelessList(); |
// Creates the map of remembered networks |
ListValue* GetRememberedList(); |
+ // Refresh the display of network information |
+ void RefreshNetworkData(chromeos::NetworkLibrary* cros); |
+ // Monitor the active network, if any |
+ void MonitorActiveNetwork(chromeos::NetworkLibrary* cros); |
+ // If any network is currently active, this is its service path |
+ std::string active_network_; |
+ |
DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler); |
}; |