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

Side by Side Diff: chrome/browser/chromeos/cros/network_library_impl_base.h

Issue 10868076: Only import certificates with Web trust from ONC if the user is managed and matches the enterprise … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebaesd Created 8 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 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_
6 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_ 6 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_
7 7
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 10
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 virtual void EnableMobileNetworkDevice(bool enable) OVERRIDE; 234 virtual void EnableMobileNetworkDevice(bool enable) OVERRIDE;
235 virtual void EnableWimaxNetworkDevice(bool enable) OVERRIDE; 235 virtual void EnableWimaxNetworkDevice(bool enable) OVERRIDE;
236 virtual void EnableCellularNetworkDevice(bool enable) OVERRIDE; 236 virtual void EnableCellularNetworkDevice(bool enable) OVERRIDE;
237 // virtual EnableOfflineMode implemented in derived classes. 237 // virtual EnableOfflineMode implemented in derived classes.
238 // virtual GetIPConfigs implemented in derived classes. 238 // virtual GetIPConfigs implemented in derived classes.
239 // virtual SetIPConfig implemented in derived classes. 239 // virtual SetIPConfig implemented in derived classes.
240 virtual void SwitchToPreferredNetwork() OVERRIDE; 240 virtual void SwitchToPreferredNetwork() OVERRIDE;
241 virtual bool LoadOncNetworks(const std::string& onc_blob, 241 virtual bool LoadOncNetworks(const std::string& onc_blob,
242 const std::string& passphrase, 242 const std::string& passphrase,
243 NetworkUIData::ONCSource source, 243 NetworkUIData::ONCSource source,
244 bool allow_web_trust_from_policy,
244 std::string* error) OVERRIDE; 245 std::string* error) OVERRIDE;
245 virtual bool SetActiveNetwork(ConnectionType type, 246 virtual bool SetActiveNetwork(ConnectionType type,
246 const std::string& service_path) OVERRIDE; 247 const std::string& service_path) OVERRIDE;
247 248
248 protected: 249 protected:
249 typedef ObserverList<NetworkObserver> NetworkObserverList; 250 typedef ObserverList<NetworkObserver> NetworkObserverList;
250 typedef std::map<std::string, NetworkObserverList*> NetworkObserverMap; 251 typedef std::map<std::string, NetworkObserverList*> NetworkObserverMap;
251 252
252 typedef ObserverList<NetworkDeviceObserver> NetworkDeviceObserverList; 253 typedef ObserverList<NetworkDeviceObserver> NetworkDeviceObserverList;
253 typedef std::map<std::string, NetworkDeviceObserverList*> 254 typedef std::map<std::string, NetworkDeviceObserverList*>
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 // stray networks that flimflam still has on file, but are not known on the 510 // stray networks that flimflam still has on file, but are not known on the
510 // Chrome side. 511 // Chrome side.
511 NetworkSourceMap network_source_map_; 512 NetworkSourceMap network_source_map_;
512 513
513 DISALLOW_COPY_AND_ASSIGN(NetworkLibraryImplBase); 514 DISALLOW_COPY_AND_ASSIGN(NetworkLibraryImplBase);
514 }; 515 };
515 516
516 } // namespace chromeos 517 } // namespace chromeos
517 518
518 #endif // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_ 519 #endif // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.h ('k') | chrome/browser/chromeos/cros/network_library_impl_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698