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

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

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 const network_handler::ErrorCallback& error_callback); 120 const network_handler::ErrorCallback& error_callback);
121 121
122 // Returns true if ConnectToNetwork has been called with |service_path| and 122 // Returns true if ConnectToNetwork has been called with |service_path| and
123 // has not completed (i.e. success or error callback has been called). 123 // has not completed (i.e. success or error callback has been called).
124 bool HasConnectingNetwork(const std::string& service_path); 124 bool HasConnectingNetwork(const std::string& service_path);
125 125
126 // Returns true if there are any pending connect requests. 126 // Returns true if there are any pending connect requests.
127 bool HasPendingConnectRequest(); 127 bool HasPendingConnectRequest();
128 128
129 // NetworkStateHandlerObserver 129 // NetworkStateHandlerObserver
130 virtual void NetworkListChanged() OVERRIDE; 130 virtual void NetworkListChanged() override;
131 virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE; 131 virtual void NetworkPropertiesUpdated(const NetworkState* network) override;
132 132
133 // LoginState::Observer 133 // LoginState::Observer
134 virtual void LoggedInStateChanged() OVERRIDE; 134 virtual void LoggedInStateChanged() override;
135 135
136 // CertLoader::Observer 136 // CertLoader::Observer
137 virtual void OnCertificatesLoaded(const net::CertificateList& cert_list, 137 virtual void OnCertificatesLoaded(const net::CertificateList& cert_list,
138 bool initial_load) OVERRIDE; 138 bool initial_load) override;
139 139
140 // NetworkPolicyObserver 140 // NetworkPolicyObserver
141 virtual void PolicyChanged(const std::string& userhash) OVERRIDE; 141 virtual void PolicyChanged(const std::string& userhash) override;
142 142
143 private: 143 private:
144 friend class NetworkHandler; 144 friend class NetworkHandler;
145 friend class NetworkConnectionHandlerTest; 145 friend class NetworkConnectionHandlerTest;
146 146
147 struct ConnectRequest; 147 struct ConnectRequest;
148 148
149 NetworkConnectionHandler(); 149 NetworkConnectionHandler();
150 150
151 void Init(NetworkStateHandler* network_state_handler, 151 void Init(NetworkStateHandler* network_state_handler,
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 // Whether the handler already requested a 'ConnectToBestNetwork' after login, 246 // Whether the handler already requested a 'ConnectToBestNetwork' after login,
247 // see ConnectToBestNetworkAfterLogin(). 247 // see ConnectToBestNetworkAfterLogin().
248 bool requested_connect_to_best_network_; 248 bool requested_connect_to_best_network_;
249 249
250 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler); 250 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler);
251 }; 251 };
252 252
253 } // namespace chromeos 253 } // namespace chromeos
254 254
255 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ 255 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
OLDNEW
« no previous file with comments | « chromeos/network/network_configuration_handler_unittest.cc ('k') | chromeos/network/network_connection_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698