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

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

Issue 1085993002: Revert of Use networkingPrivate.startConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430115_internet_options_cellular
Patch Set: Created 5 years, 8 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
« no previous file with comments | « chromeos/network/network_state.cc ('k') | chromeos/network/network_state_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_STATE_HANDLER_H_ 5 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
6 #define CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_ 6 #define CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 // Returns the NetworkState of the EthernetEAP service, which contains the 217 // Returns the NetworkState of the EthernetEAP service, which contains the
218 // EAP parameters used by the ethernet with |service_path|. If |service_path| 218 // EAP parameters used by the ethernet with |service_path|. If |service_path|
219 // doesn't refer to an ethernet service or if the ethernet service is not 219 // doesn't refer to an ethernet service or if the ethernet service is not
220 // connected using EAP, returns NULL. 220 // connected using EAP, returns NULL.
221 const NetworkState* GetEAPForEthernet(const std::string& service_path); 221 const NetworkState* GetEAPForEthernet(const std::string& service_path);
222 222
223 const std::string& default_network_path() const { 223 const std::string& default_network_path() const {
224 return default_network_path_; 224 return default_network_path_;
225 } 225 }
226 226
227 // Sets the |last_error_| property of the matching NetworkState for tests.
228 void SetLastErrorForTest(const std::string& service_path,
229 const std::string& error);
230
231 // Constructs and initializes an instance for testing. 227 // Constructs and initializes an instance for testing.
232 static NetworkStateHandler* InitializeForTest(); 228 static NetworkStateHandler* InitializeForTest();
233 229
234 // Default set of comma separated interfaces on which to enable 230 // Default set of comma separated interfaces on which to enable
235 // portal checking. 231 // portal checking.
236 static const char kDefaultCheckPortalList[]; 232 static const char kDefaultCheckPortalList[];
237 233
238 protected: 234 protected:
239 friend class NetworkHandler; 235 friend class NetworkHandler;
240 NetworkStateHandler(); 236 NetworkStateHandler();
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 // Map of network specifiers to guids. Contains an entry for each 379 // Map of network specifiers to guids. Contains an entry for each
384 // NetworkState that is not saved in a profile. 380 // NetworkState that is not saved in a profile.
385 SpecifierGuidMap specifier_guid_map_; 381 SpecifierGuidMap specifier_guid_map_;
386 382
387 DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler); 383 DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler);
388 }; 384 };
389 385
390 } // namespace chromeos 386 } // namespace chromeos
391 387
392 #endif // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_ 388 #endif // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
OLDNEW
« no previous file with comments | « chromeos/network/network_state.cc ('k') | chromeos/network/network_state_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698