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

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

Issue 240903002: Add consumer_device_management_service() in BrowserPolicyConnectorChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 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/files/file_path.h" 8 #include "base/files/file_path.h"
8 #include "base/logging.h" 9 #include "base/logging.h"
9 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
10 #include "base/path_service.h" 11 #include "base/path_service.h"
11 #include "base/prefs/pref_registry_simple.h" 12 #include "base/prefs/pref_registry_simple.h"
12 #include "base/sequenced_task_runner.h" 13 #include "base/sequenced_task_runner.h"
13 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
14 #include "base/threading/sequenced_worker_pool.h" 15 #include "base/threading/sequenced_worker_pool.h"
15 #include "chrome/browser/chromeos/policy/app_pack_updater.h" 16 #include "chrome/browser/chromeos/policy/app_pack_updater.h"
16 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 17 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
17 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" 18 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
18 #include "chrome/browser/chromeos/policy/device_local_account.h" 19 #include "chrome/browser/chromeos/policy/device_local_account.h"
19 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" 20 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
20 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" 21 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h"
21 #include "chrome/browser/chromeos/policy/device_status_collector.h" 22 #include "chrome/browser/chromeos/policy/device_status_collector.h"
22 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 23 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
23 #include "chrome/browser/chromeos/settings/cros_settings.h" 24 #include "chrome/browser/chromeos/settings/cros_settings.h"
24 #include "chrome/browser/chromeos/settings/device_settings_service.h" 25 #include "chrome/browser/chromeos/settings/device_settings_service.h"
26 #include "chrome/browser/policy/device_management_service_configuration.h"
25 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
26 #include "chromeos/chromeos_paths.h" 28 #include "chromeos/chromeos_paths.h"
27 #include "chromeos/chromeos_switches.h" 29 #include "chromeos/chromeos_switches.h"
28 #include "chromeos/cryptohome/system_salt_getter.h" 30 #include "chromeos/cryptohome/system_salt_getter.h"
29 #include "chromeos/dbus/dbus_thread_manager.h" 31 #include "chromeos/dbus/dbus_thread_manager.h"
30 #include "chromeos/network/network_handler.h" 32 #include "chromeos/network/network_handler.h"
31 #include "chromeos/network/onc/onc_certificate_importer_impl.h" 33 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
32 #include "chromeos/settings/cros_settings_names.h" 34 #include "chromeos/settings/cros_settings_names.h"
33 #include "chromeos/settings/cros_settings_provider.h" 35 #include "chromeos/settings/cros_settings_provider.h"
34 #include "chromeos/settings/timezone_settings.h" 36 #include "chromeos/settings/timezone_settings.h"
35 #include "chromeos/system/statistics_provider.h" 37 #include "chromeos/system/statistics_provider.h"
36 #include "components/policy/core/common/cloud/cloud_policy_client.h" 38 #include "components/policy/core/common/cloud/cloud_policy_client.h"
37 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h" 39 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
38 #include "components/policy/core/common/proxy_policy_provider.h" 40 #include "components/policy/core/common/proxy_policy_provider.h"
39 #include "content/public/browser/browser_thread.h" 41 #include "content/public/browser/browser_thread.h"
40 #include "google_apis/gaia/gaia_auth_util.h" 42 #include "google_apis/gaia/gaia_auth_util.h"
41 #include "net/url_request/url_request_context_getter.h" 43 #include "net/url_request/url_request_context_getter.h"
42 44
43 using content::BrowserThread; 45 using content::BrowserThread;
44 46
45 namespace policy { 47 namespace policy {
46 48
47 namespace { 49 namespace {
48 50
51 // TODO(davidyu): Update the URL to the real one once it is ready.
52 // http://crbug.com/366491.
53 //
54 // The URL for the consumer device management server.
55 const char kDefaultConsumerDeviceManagementServerUrl[] =
56 "https://m.google.com/devicemanagement/data/api";
57
49 // Install attributes for tests. 58 // Install attributes for tests.
50 EnterpriseInstallAttributes* g_testing_install_attributes = NULL; 59 EnterpriseInstallAttributes* g_testing_install_attributes = NULL;
51 60
52 // Helper that returns a new SequencedTaskRunner backed by the blocking pool. 61 // Helper that returns a new SequencedTaskRunner backed by the blocking pool.
53 // Each SequencedTaskRunner returned is independent from the others. 62 // Each SequencedTaskRunner returned is independent from the others.
54 scoped_refptr<base::SequencedTaskRunner> GetBackgroundTaskRunner() { 63 scoped_refptr<base::SequencedTaskRunner> GetBackgroundTaskRunner() {
55 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); 64 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
56 CHECK(pool); 65 CHECK(pool);
57 return pool->GetSequencedTaskRunnerWithShutdownBehavior( 66 return pool->GetSequencedTaskRunnerWithShutdownBehavior(
58 pool->GetSequenceToken(), base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); 67 pool->GetSequenceToken(), base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
59 } 68 }
60 69
70 std::string GetConsumerDeviceManagementServerUrl() {
bartfab (slow) 2014/04/25 09:17:35 Nit: #include <string>
davidyu 2014/04/28 02:58:22 Done.
71 CommandLine* command_line = CommandLine::ForCurrentProcess();
bartfab (slow) 2014/04/25 09:17:35 Nit: const.
davidyu 2014/04/28 02:58:22 Done.
72 if (command_line->HasSwitch(
73 chromeos::switches::kConsumerDeviceManagementUrl)) {
74 return command_line->GetSwitchValueASCII(
75 chromeos::switches::kConsumerDeviceManagementUrl);
76 }
77 return kDefaultConsumerDeviceManagementServerUrl;
78 };
79
61 } // namespace 80 } // namespace
62 81
63 BrowserPolicyConnectorChromeOS::BrowserPolicyConnectorChromeOS() 82 BrowserPolicyConnectorChromeOS::BrowserPolicyConnectorChromeOS()
64 : device_cloud_policy_manager_(NULL), 83 : device_cloud_policy_manager_(NULL),
65 global_user_cloud_policy_provider_(NULL), 84 global_user_cloud_policy_provider_(NULL),
66 weak_ptr_factory_(this) { 85 weak_ptr_factory_(this) {
67 if (g_testing_install_attributes) 86 if (g_testing_install_attributes)
68 install_attributes_.reset(g_testing_install_attributes); 87 install_attributes_.reset(g_testing_install_attributes);
69 88
70 // SystemSaltGetter or DBusThreadManager may be uninitialized on unit tests. 89 // SystemSaltGetter or DBusThreadManager may be uninitialized on unit tests.
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 global_user_cloud_policy_provider_)); 122 global_user_cloud_policy_provider_));
104 } 123 }
105 124
106 BrowserPolicyConnectorChromeOS::~BrowserPolicyConnectorChromeOS() {} 125 BrowserPolicyConnectorChromeOS::~BrowserPolicyConnectorChromeOS() {}
107 126
108 void BrowserPolicyConnectorChromeOS::Init( 127 void BrowserPolicyConnectorChromeOS::Init(
109 PrefService* local_state, 128 PrefService* local_state,
110 scoped_refptr<net::URLRequestContextGetter> request_context) { 129 scoped_refptr<net::URLRequestContextGetter> request_context) {
111 ChromeBrowserPolicyConnector::Init(local_state, request_context); 130 ChromeBrowserPolicyConnector::Init(local_state, request_context);
112 131
132 scoped_ptr<DeviceManagementService::Configuration> configuration(
133 new DeviceManagementServiceConfiguration(
134 GetConsumerDeviceManagementServerUrl()));
135 consumer_device_management_service_.reset(
136 new DeviceManagementService(configuration.Pass()));
137 consumer_device_management_service_->ScheduleInitialization(
138 kServiceInitializationStartupDelay);
139
113 if (device_cloud_policy_manager_) { 140 if (device_cloud_policy_manager_) {
114 // Note: for now the |device_cloud_policy_manager_| is using the global 141 // Note: for now the |device_cloud_policy_manager_| is using the global
115 // schema registry. Eventually it will have its own registry, once device 142 // schema registry. Eventually it will have its own registry, once device
116 // cloud policy for extensions is introduced. That means it'd have to be 143 // cloud policy for extensions is introduced. That means it'd have to be
117 // initialized from here instead of BrowserPolicyConnector::Init(). 144 // initialized from here instead of BrowserPolicyConnector::Init().
118 145
119 scoped_ptr<CloudPolicyClient::StatusProvider> status_provider( 146 scoped_ptr<CloudPolicyClient::StatusProvider> status_provider(
120 new DeviceStatusCollector( 147 new DeviceStatusCollector(
121 local_state, 148 local_state,
122 chromeos::system::StatisticsProvider::GetInstance(), 149 chromeos::system::StatisticsProvider::GetInstance(),
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 std::string timezone; 263 std::string timezone;
237 if (chromeos::CrosSettings::Get()->GetString(chromeos::kSystemTimezonePolicy, 264 if (chromeos::CrosSettings::Get()->GetString(chromeos::kSystemTimezonePolicy,
238 &timezone) && 265 &timezone) &&
239 !timezone.empty()) { 266 !timezone.empty()) {
240 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( 267 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
241 base::UTF8ToUTF16(timezone)); 268 base::UTF8ToUTF16(timezone));
242 } 269 }
243 } 270 }
244 271
245 } // namespace policy 272 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698