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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/network_state_informer.cc

Issue 23684042: Eliminate NetworkManagerChanged (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 5 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 void NetworkStateInformer::AddObserver(NetworkStateInformerObserver* observer) { 56 void NetworkStateInformer::AddObserver(NetworkStateInformerObserver* observer) {
57 if (!observers_.HasObserver(observer)) 57 if (!observers_.HasObserver(observer))
58 observers_.AddObserver(observer); 58 observers_.AddObserver(observer);
59 } 59 }
60 60
61 void NetworkStateInformer::RemoveObserver( 61 void NetworkStateInformer::RemoveObserver(
62 NetworkStateInformerObserver* observer) { 62 NetworkStateInformerObserver* observer) {
63 observers_.RemoveObserver(observer); 63 observers_.RemoveObserver(observer);
64 } 64 }
65 65
66 void NetworkStateInformer::NetworkManagerChanged() {
67 UpdateStateAndNotify();
68 }
69
70 void NetworkStateInformer::DefaultNetworkChanged(const NetworkState* network) { 66 void NetworkStateInformer::DefaultNetworkChanged(const NetworkState* network) {
71 UpdateStateAndNotify(); 67 UpdateStateAndNotify();
72 } 68 }
73 69
74 void NetworkStateInformer::OnPortalDetectionCompleted( 70 void NetworkStateInformer::OnPortalDetectionCompleted(
75 const NetworkState* network, 71 const NetworkState* network,
76 const NetworkPortalDetector::CaptivePortalState& state) { 72 const NetworkPortalDetector::CaptivePortalState& state) {
77 UpdateStateAndNotify(); 73 UpdateStateAndNotify();
78 } 74 }
79 75
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 scoped_ptr<ProxyConfigDictionary> proxy_dict = 175 scoped_ptr<ProxyConfigDictionary> proxy_dict =
180 proxy_config::GetProxyConfigForNetwork( 176 proxy_config::GetProxyConfigForNetwork(
181 NULL, g_browser_process->local_state(), *network, &onc_source); 177 NULL, g_browser_process->local_state(), *network, &onc_source);
182 ProxyPrefs::ProxyMode mode; 178 ProxyPrefs::ProxyMode mode;
183 return (proxy_dict && 179 return (proxy_dict &&
184 proxy_dict->GetMode(&mode) && 180 proxy_dict->GetMode(&mode) &&
185 mode == ProxyPrefs::MODE_FIXED_SERVERS); 181 mode == ProxyPrefs::MODE_FIXED_SERVERS);
186 } 182 }
187 183
188 } // namespace chromeos 184 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_state_informer.h ('k') | chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698