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

Unified Diff: trunk/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.h

Issue 15954007: Revert 202478 "Revert 202388 "Remove NetworkStateInformer's depe..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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
« no previous file with comments | « no previous file | trunk/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.h
===================================================================
--- trunk/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.h (revision 202496)
+++ trunk/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.h (working copy)
@@ -11,6 +11,7 @@
#include "base/cancelable_callback.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
#include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
@@ -94,21 +95,6 @@
std::string last_network_type() const { return last_network_type_; }
private:
- struct ProxyState {
- ProxyState() : configured(false) {
- }
-
- ProxyState(const std::string& proxy_config, bool configured)
- : proxy_config(proxy_config),
- configured(configured) {
- }
-
- std::string proxy_config;
- bool configured;
- };
-
- typedef std::map<std::string, ProxyState> ProxyStateMap;
-
friend class base::RefCounted<NetworkStateInformer>;
virtual ~NetworkStateInformer();
@@ -131,8 +117,7 @@
std::string last_network_type_;
base::CancelableClosure check_state_;
- // Caches proxy state for active networks.
- ProxyStateMap proxy_state_map_;
+ base::WeakPtrFactory<NetworkStateInformer> weak_ptr_factory_;
};
} // namespace chromeos
« no previous file with comments | « no previous file | trunk/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698