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

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

Issue 438493002: Added ConsumerManagementService class to handle enroll state and device owner info in boot lockbox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@signin
Patch Set: Call FlushAndSignBootAttributes() in SetOwner(). Created 6 years, 4 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 <string> 7 #include <string>
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/message_loop/message_loop_proxy.h" 15 #include "base/message_loop/message_loop_proxy.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/prefs/pref_registry_simple.h" 17 #include "base/prefs/pref_registry_simple.h"
18 #include "base/sequenced_task_runner.h" 18 #include "base/sequenced_task_runner.h"
19 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
20 #include "base/threading/sequenced_worker_pool.h" 20 #include "base/threading/sequenced_worker_pool.h"
21 #include "chrome/browser/chromeos/policy/app_pack_updater.h" 21 #include "chrome/browser/chromeos/policy/app_pack_updater.h"
22 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
22 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" 23 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
23 #include "chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h" 24 #include "chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h"
24 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 25 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
25 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" 26 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
26 #include "chrome/browser/chromeos/policy/device_local_account.h" 27 #include "chrome/browser/chromeos/policy/device_local_account.h"
27 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" 28 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
28 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" 29 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h"
29 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 30 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
30 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h" 31 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h"
31 #include "chrome/browser/chromeos/settings/cros_settings.h" 32 #include "chrome/browser/chromeos/settings/cros_settings.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 ChromeBrowserPolicyConnector::Init(local_state, request_context); 142 ChromeBrowserPolicyConnector::Init(local_state, request_context);
142 143
143 scoped_ptr<DeviceManagementService::Configuration> configuration( 144 scoped_ptr<DeviceManagementService::Configuration> configuration(
144 new DeviceManagementServiceConfiguration( 145 new DeviceManagementServiceConfiguration(
145 GetConsumerDeviceManagementServerUrl())); 146 GetConsumerDeviceManagementServerUrl()));
146 consumer_device_management_service_.reset( 147 consumer_device_management_service_.reset(
147 new DeviceManagementService(configuration.Pass())); 148 new DeviceManagementService(configuration.Pass()));
148 consumer_device_management_service_->ScheduleInitialization( 149 consumer_device_management_service_->ScheduleInitialization(
149 kServiceInitializationStartupDelay); 150 kServiceInitializationStartupDelay);
150 151
152 chromeos::CryptohomeClient* cryptohome_client =
bartfab (slow) 2014/08/04 18:44:50 Nit: #include "chromeos/dbus/cryptohome_client.h"
davidyu 2014/08/05 07:26:58 Done.
153 chromeos::DBusThreadManager::Get()->GetCryptohomeClient();
154 consumer_management_service_.reset(
155 new ConsumerManagementService(cryptohome_client));
156
151 if (device_cloud_policy_manager_) { 157 if (device_cloud_policy_manager_) {
152 // Note: for now the |device_cloud_policy_manager_| is using the global 158 // Note: for now the |device_cloud_policy_manager_| is using the global
153 // schema registry. Eventually it will have its own registry, once device 159 // schema registry. Eventually it will have its own registry, once device
154 // cloud policy for extensions is introduced. That means it'd have to be 160 // cloud policy for extensions is introduced. That means it'd have to be
155 // initialized from here instead of BrowserPolicyConnector::Init(). 161 // initialized from here instead of BrowserPolicyConnector::Init().
156 162
157 device_cloud_policy_manager_->Initialize(local_state); 163 device_cloud_policy_manager_->Initialize(local_state);
158 164
159 device_cloud_policy_initializer_.reset( 165 device_cloud_policy_initializer_.reset(
160 new DeviceCloudPolicyInitializer( 166 new DeviceCloudPolicyInitializer(
161 local_state, 167 local_state,
162 device_management_service(), 168 device_management_service(),
163 consumer_device_management_service(), 169 GetConsumerDeviceManagementService(),
164 GetBackgroundTaskRunner(), 170 GetBackgroundTaskRunner(),
165 install_attributes_.get(), 171 install_attributes_.get(),
166 state_keys_broker_.get(), 172 state_keys_broker_.get(),
167 device_cloud_policy_manager_->device_store(), 173 device_cloud_policy_manager_->device_store(),
168 device_cloud_policy_manager_, 174 device_cloud_policy_manager_,
169 chromeos::DeviceSettingsService::Get(), 175 chromeos::DeviceSettingsService::Get(),
170 base::Bind(&BrowserPolicyConnectorChromeOS:: 176 base::Bind(&BrowserPolicyConnectorChromeOS::
171 OnDeviceCloudPolicyManagerConnected, 177 OnDeviceCloudPolicyManagerConnected,
172 base::Unretained(this)))); 178 base::Unretained(this))));
173 } 179 }
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 // This function is invoked by DCPInitializer, so we should release the 317 // This function is invoked by DCPInitializer, so we should release the
312 // initializer after this function returns. 318 // initializer after this function returns.
313 if (device_cloud_policy_initializer_) { 319 if (device_cloud_policy_initializer_) {
314 device_cloud_policy_initializer_->Shutdown(); 320 device_cloud_policy_initializer_->Shutdown();
315 base::MessageLoop::current()->DeleteSoon( 321 base::MessageLoop::current()->DeleteSoon(
316 FROM_HERE, device_cloud_policy_initializer_.release()); 322 FROM_HERE, device_cloud_policy_initializer_.release());
317 } 323 }
318 } 324 }
319 325
320 } // namespace policy 326 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698