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 <ostream> | 7 #include <ostream> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/json/json_string_value_serializer.h" | 10 #include "base/json/json_string_value_serializer.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
13 #include "chrome/browser/chromeos/cros/cros_library.h" | 13 #include "chrome/browser/chromeos/cros/cros_library.h" |
14 #include "chrome/browser/chromeos/login/user_manager.h" | 14 #include "chrome/browser/chromeos/login/user_manager.h" |
15 #include "chrome/browser/chromeos/settings/cros_settings.h" | 15 #include "chrome/browser/chromeos/settings/cros_settings.h" |
16 #include "chrome/browser/chromeos/settings/cros_settings_names.h" | 16 #include "chrome/browser/chromeos/settings/cros_settings_names.h" |
17 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" | 17 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" |
18 #include "chrome/browser/prefs/pref_registry_simple.h" | 18 #include "chrome/browser/prefs/pref_registry_simple.h" |
| 19 #include "chrome/browser/prefs/pref_registry_syncable.h" |
19 #include "chrome/browser/prefs/pref_service.h" | 20 #include "chrome/browser/prefs/pref_service.h" |
20 #include "chrome/browser/prefs/proxy_config_dictionary.h" | 21 #include "chrome/browser/prefs/proxy_config_dictionary.h" |
21 #include "chrome/browser/prefs/proxy_prefs.h" | 22 #include "chrome/browser/prefs/proxy_prefs.h" |
22 #include "chrome/browser/profiles/profile_manager.h" | 23 #include "chrome/browser/profiles/profile_manager.h" |
23 #include "chrome/common/chrome_notification_types.h" | 24 #include "chrome/common/chrome_notification_types.h" |
24 #include "chrome/common/pref_names.h" | 25 #include "chrome/common/pref_names.h" |
25 #include "chromeos/network/onc/onc_constants.h" | 26 #include "chromeos/network/onc/onc_constants.h" |
26 #include "content/public/browser/notification_service.h" | 27 #include "content/public/browser/notification_service.h" |
27 #include "grit/generated_resources.h" | 28 #include "grit/generated_resources.h" |
28 #include "ui/base/l10n/l10n_util.h" | 29 #include "ui/base/l10n/l10n_util.h" |
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
581 } | 582 } |
582 | 583 |
583 // static | 584 // static |
584 void ProxyConfigServiceImpl::RegisterPrefs(PrefRegistrySimple* registry) { | 585 void ProxyConfigServiceImpl::RegisterPrefs(PrefRegistrySimple* registry) { |
585 // Use shared proxies default to off. GetUseSharedProxies will return the | 586 // Use shared proxies default to off. GetUseSharedProxies will return the |
586 // correct value based on pre-login and login. | 587 // correct value based on pre-login and login. |
587 registry->RegisterBooleanPref(prefs::kUseSharedProxies, true); | 588 registry->RegisterBooleanPref(prefs::kUseSharedProxies, true); |
588 } | 589 } |
589 | 590 |
590 // static | 591 // static |
591 void ProxyConfigServiceImpl::RegisterUserPrefs( | 592 void ProxyConfigServiceImpl::RegisterUserPrefs(PrefRegistrySyncable* registry) { |
592 PrefServiceSyncable* pref_service) { | 593 registry->RegisterBooleanPref(prefs::kUseSharedProxies, |
593 pref_service->RegisterBooleanPref(prefs::kUseSharedProxies, | 594 true, |
594 true, | 595 PrefRegistrySyncable::UNSYNCABLE_PREF); |
595 PrefServiceSyncable::UNSYNCABLE_PREF); | |
596 } | 596 } |
597 | 597 |
598 //------------------ ProxyConfigServiceImpl: private methods ------------------- | 598 //------------------ ProxyConfigServiceImpl: private methods ------------------- |
599 | 599 |
600 void ProxyConfigServiceImpl::OnUseSharedProxiesChanged() { | 600 void ProxyConfigServiceImpl::OnUseSharedProxiesChanged() { |
601 VLOG(1) << "New use-shared-proxies = " << GetUseSharedProxies(); | 601 VLOG(1) << "New use-shared-proxies = " << GetUseSharedProxies(); |
602 | 602 |
603 // Determine new proxy config which may have changed because of new | 603 // Determine new proxy config which may have changed because of new |
604 // use-shared-proxies. If necessary, activate it. | 604 // use-shared-proxies. If necessary, activate it. |
605 Network* network = NULL; | 605 Network* network = NULL; |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
847 device_config_.clear(); | 847 device_config_.clear(); |
848 return; | 848 return; |
849 } | 849 } |
850 if (!active_network_.empty()) { | 850 if (!active_network_.empty()) { |
851 VLOG(1) << "Try migrating device config to " << active_network_; | 851 VLOG(1) << "Try migrating device config to " << active_network_; |
852 SetProxyConfigForNetwork(active_network_, device_config_, true); | 852 SetProxyConfigForNetwork(active_network_, device_config_, true); |
853 } | 853 } |
854 } | 854 } |
855 | 855 |
856 } // namespace chromeos | 856 } // namespace chromeos |
OLD | NEW |