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

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

Issue 1784333002: Add Device Policy Handler for Bluetooth, and allow disabling the Bluetooth adapter on Chrome OS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bartfab's nits Created 4 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 <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/sequenced_task_runner.h" 17 #include "base/sequenced_task_runner.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "base/thread_task_runner_handle.h" 19 #include "base/thread_task_runner_handle.h"
20 #include "base/threading/sequenced_worker_pool.h" 20 #include "base/threading/sequenced_worker_pool.h"
21 #include "chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h" 21 #include "chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h"
22 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide r.h" 22 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide r.h"
23 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide r_impl.h" 23 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide r_impl.h"
24 #include "chrome/browser/chromeos/policy/bluetooth_policy_handler.h"
24 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 25 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
25 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" 26 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
26 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" 27 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
27 #include "chrome/browser/chromeos/policy/device_local_account.h" 28 #include "chrome/browser/chromeos/policy/device_local_account.h"
28 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" 29 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
29 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" 30 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h"
30 #include "chrome/browser/chromeos/policy/enrollment_config.h" 31 #include "chrome/browser/chromeos/policy/enrollment_config.h"
31 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 32 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
32 #include "chrome/browser/chromeos/policy/remote_commands/affiliated_remote_comma nds_invalidator.h" 33 #include "chrome/browser/chromeos/policy/remote_commands/affiliated_remote_comma nds_invalidator.h"
33 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h" 34 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 212
212 SetTimezoneIfPolicyAvailable(); 213 SetTimezoneIfPolicyAvailable();
213 214
214 network_configuration_updater_ = 215 network_configuration_updater_ =
215 DeviceNetworkConfigurationUpdater::CreateForDevicePolicy( 216 DeviceNetworkConfigurationUpdater::CreateForDevicePolicy(
216 GetPolicyService(), 217 GetPolicyService(),
217 chromeos::NetworkHandler::Get() 218 chromeos::NetworkHandler::Get()
218 ->managed_network_configuration_handler(), 219 ->managed_network_configuration_handler(),
219 chromeos::NetworkHandler::Get()->network_device_handler(), 220 chromeos::NetworkHandler::Get()->network_device_handler(),
220 chromeos::CrosSettings::Get()); 221 chromeos::CrosSettings::Get());
222
223 bluetooth_policy_handler_.reset(
224 new BluetoothPolicyHandler(chromeos::CrosSettings::Get()));
221 } 225 }
222 226
223 void BrowserPolicyConnectorChromeOS::PreShutdown() { 227 void BrowserPolicyConnectorChromeOS::PreShutdown() {
224 // Let the |affiliated_invalidation_service_provider_| unregister itself as an 228 // Let the |affiliated_invalidation_service_provider_| unregister itself as an
225 // observer of per-Profile InvalidationServices and the device-global 229 // observer of per-Profile InvalidationServices and the device-global
226 // invalidation::TiclInvalidationService it may have created as an observer of 230 // invalidation::TiclInvalidationService it may have created as an observer of
227 // the DeviceOAuth2TokenService that is destroyed before Shutdown() is called. 231 // the DeviceOAuth2TokenService that is destroyed before Shutdown() is called.
228 if (affiliated_invalidation_service_provider_) 232 if (affiliated_invalidation_service_provider_)
229 affiliated_invalidation_service_provider_->Shutdown(); 233 affiliated_invalidation_service_provider_->Shutdown();
230 } 234 }
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 device_cloud_policy_manager_->device_store()->policy(); 384 device_cloud_policy_manager_->device_store()->policy();
381 if (policy_data) { 385 if (policy_data) {
382 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), 386 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(),
383 policy_data->device_affiliation_ids().end()); 387 policy_data->device_affiliation_ids().end());
384 } 388 }
385 } 389 }
386 return affiliation_ids; 390 return affiliation_ids;
387 } 391 }
388 392
389 } // namespace policy 393 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698