OLD | NEW |
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 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 5 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 << "'. Ignoring proxy."; | 136 << "'. Ignoring proxy."; |
137 return true; | 137 return true; |
138 } | 138 } |
139 if (profile->type() == NetworkProfile::TYPE_USER) { | 139 if (profile->type() == NetworkProfile::TYPE_USER) { |
140 VLOG(1) << "Respect proxy of not-shared networks."; | 140 VLOG(1) << "Respect proxy of not-shared networks."; |
141 return false; | 141 return false; |
142 } | 142 } |
143 if (onc_source == ::onc::ONC_SOURCE_DEVICE_POLICY) { | 143 if (onc_source == ::onc::ONC_SOURCE_DEVICE_POLICY) { |
144 policy::BrowserPolicyConnectorChromeOS* connector = | 144 policy::BrowserPolicyConnectorChromeOS* connector = |
145 g_browser_process->platform_part()->browser_policy_connector_chromeos(); | 145 g_browser_process->platform_part()->browser_policy_connector_chromeos(); |
146 const User* logged_in_user = UserManager::Get()->GetLoggedInUser(); | 146 const user_manager::User* logged_in_user = |
| 147 UserManager::Get()->GetLoggedInUser(); |
147 if (connector->GetUserAffiliation(logged_in_user->email()) == | 148 if (connector->GetUserAffiliation(logged_in_user->email()) == |
148 policy::USER_AFFILIATION_MANAGED) { | 149 policy::USER_AFFILIATION_MANAGED) { |
149 VLOG(1) << "Respecting proxy for network, as logged-in user belongs to " | 150 VLOG(1) << "Respecting proxy for network, as logged-in user belongs to " |
150 << "the domain the device is enrolled to."; | 151 << "the domain the device is enrolled to."; |
151 return false; | 152 return false; |
152 } | 153 } |
153 } | 154 } |
154 | 155 |
155 // This network is shared and not managed by the user's domain. | 156 // This network is shared and not managed by the user's domain. |
156 bool use_shared_proxies = profile_prefs->GetBoolean(prefs::kUseSharedProxies); | 157 bool use_shared_proxies = profile_prefs->GetBoolean(prefs::kUseSharedProxies); |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 if (VLOG_IS_ON(1) && !update_pending()) { // Update was successful. | 225 if (VLOG_IS_ON(1) && !update_pending()) { // Update was successful. |
225 scoped_ptr<base::DictionaryValue> config_dict(effective_config.ToValue()); | 226 scoped_ptr<base::DictionaryValue> config_dict(effective_config.ToValue()); |
226 VLOG(1) << this << ": Proxy changed: " | 227 VLOG(1) << this << ": Proxy changed: " |
227 << ProxyPrefs::ConfigStateToDebugString(active_config_state_) | 228 << ProxyPrefs::ConfigStateToDebugString(active_config_state_) |
228 << ", " << *config_dict; | 229 << ", " << *config_dict; |
229 } | 230 } |
230 } | 231 } |
231 } | 232 } |
232 | 233 |
233 } // namespace chromeos | 234 } // namespace chromeos |
OLD | NEW |