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

Unified Diff: chrome/browser/chromeos/options/wimax_config_view.h

Issue 21046008: Convert all connect code to use NetworkHandler instead of NetworkLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 4 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: 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..baa3ae738c56ae83ee941aa4fd4c18e932ecf422 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);
};
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.cc ('k') | chrome/browser/chromeos/options/wimax_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698