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

Side by Side Diff: chrome/browser/policy/cloud/policy_header_service_factory.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/policy/cloud/policy_header_service_factory.h" 5 #include "chrome/browser/policy/cloud/policy_header_service_factory.h"
6 6
7 #include <utility>
8
7 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
8 #include "build/build_config.h" 10 #include "build/build_config.h"
9 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
11 #include "components/keyed_service/content/browser_context_dependency_manager.h" 13 #include "components/keyed_service/content/browser_context_dependency_manager.h"
12 #include "components/keyed_service/core/keyed_service.h" 14 #include "components/keyed_service/core/keyed_service.h"
13 #include "components/policy/core/browser/browser_policy_connector.h" 15 #include "components/policy/core/browser/browser_policy_connector.h"
14 #include "components/policy/core/common/cloud/cloud_policy_store.h" 16 #include "components/policy/core/common/cloud/cloud_policy_store.h"
15 #include "components/policy/core/common/cloud/device_management_service.h" 17 #include "components/policy/core/common/cloud/device_management_service.h"
16 #include "components/policy/core/common/cloud/policy_header_service.h" 18 #include "components/policy/core/common/cloud/policy_header_service.h"
17 19
18 #if defined(OS_CHROMEOS) 20 #if defined(OS_CHROMEOS)
19 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 21 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
20 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 22 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
21 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" 23 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
22 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 24 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
23 #else 25 #else
24 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 26 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
25 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 27 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
26 #endif 28 #endif
27 29
28 namespace policy { 30 namespace policy {
29 31
30 namespace { 32 namespace {
31 33
32 class PolicyHeaderServiceWrapper : public KeyedService { 34 class PolicyHeaderServiceWrapper : public KeyedService {
33 public: 35 public:
34 explicit PolicyHeaderServiceWrapper(scoped_ptr<PolicyHeaderService> service) 36 explicit PolicyHeaderServiceWrapper(scoped_ptr<PolicyHeaderService> service)
35 : policy_header_service_(service.Pass()) {} 37 : policy_header_service_(std::move(service)) {}
36 38
37 PolicyHeaderService* policy_header_service() const { 39 PolicyHeaderService* policy_header_service() const {
38 return policy_header_service_.get(); 40 return policy_header_service_.get();
39 } 41 }
40 42
41 void Shutdown() override { 43 void Shutdown() override {
42 // Shutdown our core object so it can unregister any observers before the 44 // Shutdown our core object so it can unregister any observers before the
43 // services we depend on are shutdown. 45 // services we depend on are shutdown.
44 policy_header_service_.reset(); 46 policy_header_service_.reset();
45 } 47 }
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 CloudPolicyStore* device_store = NULL; 104 CloudPolicyStore* device_store = NULL;
103 #if defined(OS_CHROMEOS) 105 #if defined(OS_CHROMEOS)
104 device_store = connector->GetDeviceCloudPolicyManager()->core()->store(); 106 device_store = connector->GetDeviceCloudPolicyManager()->core()->store();
105 #endif 107 #endif
106 108
107 scoped_ptr<PolicyHeaderService> service = make_scoped_ptr( 109 scoped_ptr<PolicyHeaderService> service = make_scoped_ptr(
108 new PolicyHeaderService(device_management_service->GetServerUrl(), 110 new PolicyHeaderService(device_management_service->GetServerUrl(),
109 kPolicyVerificationKeyHash, 111 kPolicyVerificationKeyHash,
110 user_store, 112 user_store,
111 device_store)); 113 device_store));
112 return new PolicyHeaderServiceWrapper(service.Pass()); 114 return new PolicyHeaderServiceWrapper(std::move(service));
113 } 115 }
114 116
115 // static 117 // static
116 PolicyHeaderServiceFactory* PolicyHeaderServiceFactory::GetInstance() { 118 PolicyHeaderServiceFactory* PolicyHeaderServiceFactory::GetInstance() {
117 return base::Singleton<PolicyHeaderServiceFactory>::get(); 119 return base::Singleton<PolicyHeaderServiceFactory>::get();
118 } 120 }
119 121
120 } // namespace policy 122 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698