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

Side by Side Diff: chromeos/network/network_connection_handler.h

Issue 23684033: Fix device policy recovery on CrOS login (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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
« no previous file with comments | « chromeos/login/login_state_unittest.cc ('k') | chromeos/network/network_connection_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ 5 #ifndef CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
6 #define CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ 6 #define CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 bool HasConnectingNetwork(const std::string& service_path); 119 bool HasConnectingNetwork(const std::string& service_path);
120 120
121 // Returns true if there are any pending connect requests. 121 // Returns true if there are any pending connect requests.
122 bool HasPendingConnectRequest(); 122 bool HasPendingConnectRequest();
123 123
124 // NetworkStateHandlerObserver 124 // NetworkStateHandlerObserver
125 virtual void NetworkListChanged() OVERRIDE; 125 virtual void NetworkListChanged() OVERRIDE;
126 virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE; 126 virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE;
127 127
128 // LoginState::Observer 128 // LoginState::Observer
129 virtual void LoggedInStateChanged(LoginState::LoggedInState state) OVERRIDE; 129 virtual void LoggedInStateChanged() OVERRIDE;
130 130
131 // CertLoader::Observer 131 // CertLoader::Observer
132 virtual void OnCertificatesLoaded(const net::CertificateList& cert_list, 132 virtual void OnCertificatesLoaded(const net::CertificateList& cert_list,
133 bool initial_load) OVERRIDE; 133 bool initial_load) OVERRIDE;
134 134
135 private: 135 private:
136 friend class NetworkHandler; 136 friend class NetworkHandler;
137 friend class NetworkConnectionHandlerTest; 137 friend class NetworkConnectionHandlerTest;
138 138
139 struct ConnectRequest; 139 struct ConnectRequest;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // Track certificate loading state. 202 // Track certificate loading state.
203 bool logged_in_; 203 bool logged_in_;
204 bool certificates_loaded_; 204 bool certificates_loaded_;
205 205
206 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler); 206 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler);
207 }; 207 };
208 208
209 } // namespace chromeos 209 } // namespace chromeos
210 210
211 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ 211 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
OLDNEW
« no previous file with comments | « chromeos/login/login_state_unittest.cc ('k') | chromeos/network/network_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698