| Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
|
| index 06c7054bb127106ccca6d206e0540ad7da48be68..f209b648344308766f7586cba65820b3b2157d0c 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
|
| +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
|
| @@ -11,8 +11,6 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/browser/ui/webui/options/options_ui.h"
|
| #include "chromeos/network/network_state_handler_observer.h"
|
| -#include "content/public/browser/notification_observer.h"
|
| -#include "content/public/browser/notification_registrar.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| class Browser;
|
| @@ -38,8 +36,7 @@ namespace options {
|
| // ChromeOS internet options page UI handler.
|
| class InternetOptionsHandler
|
| : public ::options::OptionsPageUIHandler,
|
| - public chromeos::NetworkStateHandlerObserver,
|
| - public content::NotificationObserver {
|
| + public chromeos::NetworkStateHandlerObserver {
|
| public:
|
| InternetOptionsHandler();
|
| virtual ~InternetOptionsHandler();
|
| @@ -94,15 +91,12 @@ class InternetOptionsHandler
|
| const chromeos::NetworkState* network) OVERRIDE;
|
| virtual void NetworkPropertiesUpdated(
|
| const chromeos::NetworkState* network) OVERRIDE;
|
| + virtual void DevicePropertiesUpdated(
|
| + const chromeos::DeviceState* device) OVERRIDE;
|
|
|
| // Updates the logged in user type.
|
| void UpdateLoggedInUserType();
|
|
|
| - // content::NotificationObserver
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| -
|
| // Additional callbacks to set network state properties.
|
| void SetServerHostnameCallback(const base::ListValue* args);
|
| void SetPreferNetworkCallback(const base::ListValue* args);
|
| @@ -151,8 +145,6 @@ class InternetOptionsHandler
|
| // Fills network information into JS dictionary for displaying network lists.
|
| void FillNetworkInfo(base::DictionaryValue* dictionary);
|
|
|
| - content::NotificationRegistrar registrar_;
|
| -
|
| // Keep track of the service path for the network shown in the Details view.
|
| std::string details_path_;
|
|
|
|
|