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

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

Issue 701863002: Trigger ConnectToBestNetwork in more cases. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get_network_configs_from_policy
Patch Set: Moved autoconnect logic into a new handler. Created 6 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_ 5 #ifndef CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_
6 #define CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_ 6 #define CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 void CreateConfigurationFromPolicy( 99 void CreateConfigurationFromPolicy(
100 const base::DictionaryValue& shill_properties) override; 100 const base::DictionaryValue& shill_properties) override;
101 101
102 void UpdateExistingConfigurationWithPropertiesFromPolicy( 102 void UpdateExistingConfigurationWithPropertiesFromPolicy(
103 const base::DictionaryValue& existing_properties, 103 const base::DictionaryValue& existing_properties,
104 const base::DictionaryValue& new_properties) override; 104 const base::DictionaryValue& new_properties) override;
105 105
106 void OnPoliciesApplied(const NetworkProfile& profile) override; 106 void OnPoliciesApplied(const NetworkProfile& profile) override;
107 107
108 private: 108 private:
109 friend class AutoConnectHandlerTest;
109 friend class ClientCertResolverTest; 110 friend class ClientCertResolverTest;
110 friend class ManagedNetworkConfigurationHandlerTest; 111 friend class ManagedNetworkConfigurationHandlerTest;
111 friend class NetworkConnectionHandlerTest; 112 friend class NetworkConnectionHandlerTest;
112 friend class NetworkHandler; 113 friend class NetworkHandler;
113 114
114 struct Policies; 115 struct Policies;
115 typedef base::Callback<void(const std::string& service_path, 116 typedef base::Callback<void(const std::string& service_path,
116 scoped_ptr<base::DictionaryValue> properties)> 117 scoped_ptr<base::DictionaryValue> properties)>
117 GetDevicePropertiesCallback; 118 GetDevicePropertiesCallback;
118 typedef std::map<std::string, linked_ptr<Policies> > UserToPoliciesMap; 119 typedef std::map<std::string, linked_ptr<Policies> > UserToPoliciesMap;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 // For Shill client callbacks 210 // For Shill client callbacks
210 base::WeakPtrFactory<ManagedNetworkConfigurationHandlerImpl> 211 base::WeakPtrFactory<ManagedNetworkConfigurationHandlerImpl>
211 weak_ptr_factory_; 212 weak_ptr_factory_;
212 213
213 DISALLOW_COPY_AND_ASSIGN(ManagedNetworkConfigurationHandlerImpl); 214 DISALLOW_COPY_AND_ASSIGN(ManagedNetworkConfigurationHandlerImpl);
214 }; 215 };
215 216
216 } // namespace chromeos 217 } // namespace chromeos
217 218
218 #endif // CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_ 219 #endif // CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698