| Index: chrome/browser/chromeos/options/wimax_config_view.h
|
| diff --git a/chrome/browser/chromeos/options/wimax_config_view.h b/chrome/browser/chromeos/options/wimax_config_view.h
|
| index f76702ae7ddccd0142a987a59048527b9959d1cf..8cf9616b5c5c4e5b04ad4659030b0e402c19928f 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"
|
| @@ -27,11 +28,12 @@ namespace chromeos {
|
| // A dialog box for showing a password textfield.
|
| class WimaxConfigView : public ChildNetworkConfigView,
|
| public views::TextfieldController,
|
| - public views::ButtonListener {
|
| + public views::ButtonListener,
|
| + public base::SupportsWeakPtr<WimaxConfigView> {
|
| 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 +55,12 @@ class WimaxConfigView : public ChildNetworkConfigView,
|
| virtual void InitFocus() OVERRIDE;
|
|
|
| private:
|
| - void Init(WimaxNetwork* wimax);
|
| + // Initializes UI.
|
| + void Init(const std::string& service_path);
|
| +
|
| + // 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;
|
|
|