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

Side by Side Diff: chrome/browser/policy/browser_policy_connector.cc

Issue 15061007: Added a PolicyDomainDescriptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser_policy_connector.h" 5 #include "chrome/browser/policy/browser_policy_connector.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.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/prefs/pref_service.h" 18 #include "base/prefs/pref_service.h"
19 #include "base/string_util.h" 19 #include "base/string_util.h"
20 #include "base/utf_string_conversions.h" 20 #include "base/utf_string_conversions.h"
21 #include "chrome/browser/browser_process.h" 21 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/policy/async_policy_provider.h" 22 #include "chrome/browser/policy/async_policy_provider.h"
23 #include "chrome/browser/policy/cloud/cloud_policy_client.h" 23 #include "chrome/browser/policy/cloud/cloud_policy_client.h"
24 #include "chrome/browser/policy/cloud/cloud_policy_service.h" 24 #include "chrome/browser/policy/cloud/cloud_policy_service.h"
25 #include "chrome/browser/policy/cloud/device_management_service.h" 25 #include "chrome/browser/policy/cloud/device_management_service.h"
26 #include "chrome/browser/policy/configuration_policy_provider.h" 26 #include "chrome/browser/policy/configuration_policy_provider.h"
27 #include "chrome/browser/policy/managed_mode_policy_provider.h" 27 #include "chrome/browser/policy/managed_mode_policy_provider.h"
28 #include "chrome/browser/policy/policy_domain_descriptor.h"
28 #include "chrome/browser/policy/policy_service_impl.h" 29 #include "chrome/browser/policy/policy_service_impl.h"
29 #include "chrome/browser/policy/policy_statistics_collector.h" 30 #include "chrome/browser/policy/policy_statistics_collector.h"
30 #include "chrome/common/chrome_paths.h" 31 #include "chrome/common/chrome_paths.h"
31 #include "chrome/common/chrome_switches.h" 32 #include "chrome/common/chrome_switches.h"
32 #include "chrome/common/pref_names.h" 33 #include "chrome/common/pref_names.h"
33 #include "content/public/browser/browser_thread.h" 34 #include "content/public/browser/browser_thread.h"
34 #include "google_apis/gaia/gaia_auth_util.h" 35 #include "google_apis/gaia/gaia_auth_util.h"
35 #include "google_apis/gaia/gaia_constants.h" 36 #include "google_apis/gaia/gaia_constants.h"
36 #include "grit/generated_resources.h" 37 #include "grit/generated_resources.h"
37 #include "net/url_request/url_request_context_getter.h" 38 #include "net/url_request/url_request_context_getter.h"
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 if (platform_provider_) 284 if (platform_provider_)
284 providers.push_back(platform_provider_.get()); 285 providers.push_back(platform_provider_.get());
285 #if defined(OS_CHROMEOS) 286 #if defined(OS_CHROMEOS)
286 if (device_cloud_policy_manager_) 287 if (device_cloud_policy_manager_)
287 providers.push_back(device_cloud_policy_manager_.get()); 288 providers.push_back(device_cloud_policy_manager_.get());
288 #endif 289 #endif
289 std::copy(additional_providers.begin(), additional_providers.end(), 290 std::copy(additional_providers.begin(), additional_providers.end(),
290 std::back_inserter(providers)); 291 std::back_inserter(providers));
291 } 292 }
292 scoped_ptr<PolicyService> service(new PolicyServiceImpl(providers)); 293 scoped_ptr<PolicyService> service(new PolicyServiceImpl(providers));
293 service->RegisterPolicyDomain(POLICY_DOMAIN_CHROME, std::set<std::string>()); 294 scoped_refptr<PolicyDomainDescriptor> descriptor = new PolicyDomainDescriptor(
295 POLICY_DOMAIN_CHROME);
296 service->RegisterPolicyDomain(descriptor);
294 return service.Pass(); 297 return service.Pass();
295 } 298 }
296 299
297 const ConfigurationPolicyHandlerList* 300 const ConfigurationPolicyHandlerList*
298 BrowserPolicyConnector::GetHandlerList() const { 301 BrowserPolicyConnector::GetHandlerList() const {
299 return &handler_list_; 302 return &handler_list_;
300 } 303 }
301 304
302 UserAffiliation BrowserPolicyConnector::GetUserAffiliation( 305 UserAffiliation BrowserPolicyConnector::GetUserAffiliation(
303 const std::string& user_name) { 306 const std::string& user_name) {
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 return new AsyncPolicyProvider(loader.Pass()); 488 return new AsyncPolicyProvider(loader.Pass());
486 } else { 489 } else {
487 return NULL; 490 return NULL;
488 } 491 }
489 #else 492 #else
490 return NULL; 493 return NULL;
491 #endif 494 #endif
492 } 495 }
493 496
494 } // namespace policy 497 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/async_policy_provider.cc ('k') | chrome/browser/policy/cloud/component_cloud_policy_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698