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

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

Issue 22674011: Handle connecting to hidden networks correctly (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ExtensionNetworkingPrivateApiTest expectations 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 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 #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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 friend class NetworkHandler; 132 friend class NetworkHandler;
133 friend class NetworkConnectionHandlerTest; 133 friend class NetworkConnectionHandlerTest;
134 134
135 struct ConnectRequest; 135 struct ConnectRequest;
136 136
137 NetworkConnectionHandler(); 137 NetworkConnectionHandler();
138 138
139 void Init(NetworkStateHandler* network_state_handler, 139 void Init(NetworkStateHandler* network_state_handler,
140 NetworkConfigurationHandler* network_configuration_handler); 140 NetworkConfigurationHandler* network_configuration_handler);
141 141
142 ConnectRequest* pending_request(const std::string& service_path); 142 ConnectRequest* GetPendingRequest(const std::string& service_path);
143 143
144 // Callback from Shill.Service.GetProperties. Parses |properties| to verify 144 // Callback from Shill.Service.GetProperties. Parses |properties| to verify
145 // whether or not the network appears to be configured. If configured, 145 // whether or not the network appears to be configured. If configured,
146 // attempts a connection, otherwise invokes error_callback from 146 // attempts a connection, otherwise invokes error_callback from
147 // pending_requests_[service_path]. |check_error_state| is passed from 147 // pending_requests_[service_path]. |check_error_state| is passed from
148 // ConnectToNetwork(), see comment for info. 148 // ConnectToNetwork(), see comment for info.
149 void VerifyConfiguredAndConnect(bool check_error_state, 149 void VerifyConfiguredAndConnect(bool check_error_state,
150 const std::string& service_path, 150 const std::string& service_path,
151 const base::DictionaryValue& properties); 151 const base::DictionaryValue& properties);
152 152
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 // Track certificate loading state. 208 // Track certificate loading state.
209 bool logged_in_; 209 bool logged_in_;
210 bool certificates_loaded_; 210 bool certificates_loaded_;
211 211
212 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler); 212 DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler);
213 }; 213 };
214 214
215 } // namespace chromeos 215 } // namespace chromeos
216 216
217 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_ 217 #endif // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/test/data/extensions/api_test/networking/test.js ('k') | chromeos/network/network_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698