diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 04:10:05 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 04:10:05 +0000 |
| commit | b4003ac004bd391e574ca360fa9567cebc3dee08 (patch) | |
| tree | b6acf9a2719778785ec145beec4dfbec337cc346 /chrome/browser/chromeos/options/wimax_config_view.h | |
| parent | fe8ea750ae210a9db49eacb2289aa96746e98eb9 (diff) | |
| download | chromium_src-b4003ac004bd391e574ca360fa9567cebc3dee08.zip chromium_src-b4003ac004bd391e574ca360fa9567cebc3dee08.tar.gz chromium_src-b4003ac004bd391e574ca360fa9567cebc3dee08.tar.bz2 | |
Convert all connect code to use NetworkHandler instead of NetworkLibrary
* Eliminates kUseNewNetworkConnectionHandler
* Converts *_config_view to NetworkStateHandler + network_connect
* Migrates non Chrome/Browser dependent network_connect code to
ash::network_connect.
BUG=263978
R=gauravsh@chromium.org, pneubeck@chromium.org
Review URL: https://codereview.chromium.org/21046008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/options/wimax_config_view.h')
| -rw-r--r-- | chrome/browser/chromeos/options/wimax_config_view.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/options/wimax_config_view.h b/chrome/browser/chromeos/options/wimax_config_view.h index f76702a..baa3ae7 100644 --- a/chrome/browser/chromeos/options/wimax_config_view.h +++ b/chrome/browser/chromeos/options/wimax_config_view.h @@ -9,6 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/chromeos/options/network_config_view.h" #include "chrome/browser/chromeos/options/wifi_config_view.h" @@ -31,7 +32,7 @@ class WimaxConfigView : public ChildNetworkConfigView, public: // Wimax login dialog for wimax network |wimax|. |wimax| must be a non NULL // pointer to a WimaxNetwork in NetworkLibrary. - WimaxConfigView(NetworkConfigView* parent, WimaxNetwork* wimax); + WimaxConfigView(NetworkConfigView* parent, const std::string& service_path); virtual ~WimaxConfigView(); // views::TextfieldController: @@ -53,7 +54,12 @@ class WimaxConfigView : public ChildNetworkConfigView, virtual void InitFocus() OVERRIDE; private: - void Init(WimaxNetwork* wimax); + // Initializes UI. + void Init(); + + // Callback to initialize fields from uncached network properties. + void InitFromProperties(const std::string& service_path, + const base::DictionaryValue& dictionary); // Get input values. std::string GetEapIdentity() const; @@ -81,6 +87,8 @@ class WimaxConfigView : public ChildNetworkConfigView, views::ToggleImageButton* passphrase_visible_button_; views::Label* error_label_; + base::WeakPtrFactory<WimaxConfigView> weak_ptr_factory_; + DISALLOW_COPY_AND_ASSIGN(WimaxConfigView); }; |