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

Side by Side Diff: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

Issue 137203005: Moved the ProxyPolicyProvider to the policy component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@BPC-3-dm-url-at-base
Patch Set: Created 6 years, 11 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 | « no previous file | chrome/browser/chromeos/policy/proxy_policy_provider.h » ('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) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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/policy/browser_policy_connector_chromeos.h" 5 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/prefs/pref_registry_simple.h" 12 #include "base/prefs/pref_registry_simple.h"
13 #include "base/sequenced_task_runner.h" 13 #include "base/sequenced_task_runner.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/threading/sequenced_worker_pool.h" 15 #include "base/threading/sequenced_worker_pool.h"
16 #include "chrome/browser/chromeos/policy/app_pack_updater.h" 16 #include "chrome/browser/chromeos/policy/app_pack_updater.h"
17 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 17 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
18 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" 18 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
19 #include "chrome/browser/chromeos/policy/device_local_account.h" 19 #include "chrome/browser/chromeos/policy/device_local_account.h"
20 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" 20 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
21 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" 21 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h"
22 #include "chrome/browser/chromeos/policy/device_status_collector.h" 22 #include "chrome/browser/chromeos/policy/device_status_collector.h"
23 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 23 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
24 #include "chrome/browser/chromeos/policy/proxy_policy_provider.h"
25 #include "chrome/browser/chromeos/settings/cros_settings.h" 24 #include "chrome/browser/chromeos/settings/cros_settings.h"
26 #include "chrome/browser/chromeos/settings/device_settings_service.h" 25 #include "chrome/browser/chromeos/settings/device_settings_service.h"
27 #include "chrome/common/pref_names.h" 26 #include "chrome/common/pref_names.h"
28 #include "chromeos/chromeos_paths.h" 27 #include "chromeos/chromeos_paths.h"
29 #include "chromeos/chromeos_switches.h" 28 #include "chromeos/chromeos_switches.h"
30 #include "chromeos/cryptohome/system_salt_getter.h" 29 #include "chromeos/cryptohome/system_salt_getter.h"
31 #include "chromeos/dbus/dbus_thread_manager.h" 30 #include "chromeos/dbus/dbus_thread_manager.h"
32 #include "chromeos/network/network_handler.h" 31 #include "chromeos/network/network_handler.h"
33 #include "chromeos/network/onc/onc_certificate_importer_impl.h" 32 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
34 #include "chromeos/settings/cros_settings_names.h" 33 #include "chromeos/settings/cros_settings_names.h"
35 #include "chromeos/settings/cros_settings_provider.h" 34 #include "chromeos/settings/cros_settings_provider.h"
36 #include "chromeos/settings/timezone_settings.h" 35 #include "chromeos/settings/timezone_settings.h"
37 #include "chromeos/system/statistics_provider.h" 36 #include "chromeos/system/statistics_provider.h"
38 #include "components/policy/core/common/cloud/cloud_policy_client.h" 37 #include "components/policy/core/common/cloud/cloud_policy_client.h"
39 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h" 38 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
39 #include "components/policy/core/common/proxy_policy_provider.h"
40 #include "content/public/browser/browser_thread.h" 40 #include "content/public/browser/browser_thread.h"
41 #include "google_apis/gaia/gaia_auth_util.h" 41 #include "google_apis/gaia/gaia_auth_util.h"
42 #include "net/url_request/url_request_context_getter.h" 42 #include "net/url_request/url_request_context_getter.h"
43 43
44 using content::BrowserThread; 44 using content::BrowserThread;
45 45
46 namespace policy { 46 namespace policy {
47 47
48 namespace { 48 namespace {
49 49
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 std::string timezone; 240 std::string timezone;
241 if (chromeos::CrosSettings::Get()->GetString(chromeos::kSystemTimezonePolicy, 241 if (chromeos::CrosSettings::Get()->GetString(chromeos::kSystemTimezonePolicy,
242 &timezone) && 242 &timezone) &&
243 !timezone.empty()) { 243 !timezone.empty()) {
244 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( 244 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
245 base::UTF8ToUTF16(timezone)); 245 base::UTF8ToUTF16(timezone));
246 } 246 }
247 } 247 }
248 248
249 } // namespace policy 249 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/proxy_policy_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698