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

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

Issue 27536003: Moved prefs::kUserPolicyRefreshRate to component/policy/policy_pref_names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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"
(...skipping 18 matching lines...) Expand all
29 #include "chrome/browser/policy/cloud/cloud_policy_service.h" 29 #include "chrome/browser/policy/cloud/cloud_policy_service.h"
30 #include "chrome/browser/policy/cloud/device_management_service.h" 30 #include "chrome/browser/policy/cloud/device_management_service.h"
31 #include "chrome/browser/policy/configuration_policy_provider.h" 31 #include "chrome/browser/policy/configuration_policy_provider.h"
32 #include "chrome/browser/policy/policy_domain_descriptor.h" 32 #include "chrome/browser/policy/policy_domain_descriptor.h"
33 #include "chrome/browser/policy/policy_service_impl.h" 33 #include "chrome/browser/policy/policy_service_impl.h"
34 #include "chrome/browser/policy/policy_statistics_collector.h" 34 #include "chrome/browser/policy/policy_statistics_collector.h"
35 #include "chrome/common/chrome_paths.h" 35 #include "chrome/common/chrome_paths.h"
36 #include "chrome/common/chrome_switches.h" 36 #include "chrome/common/chrome_switches.h"
37 #include "chrome/common/chrome_version_info.h" 37 #include "chrome/common/chrome_version_info.h"
38 #include "chrome/common/pref_names.h" 38 #include "chrome/common/pref_names.h"
39 #include "components/policy/core/common/policy_pref_names.h"
39 #include "content/public/browser/browser_thread.h" 40 #include "content/public/browser/browser_thread.h"
40 #include "content/public/common/content_client.h" 41 #include "content/public/common/content_client.h"
41 #include "google_apis/gaia/gaia_auth_util.h" 42 #include "google_apis/gaia/gaia_auth_util.h"
42 #include "google_apis/gaia/gaia_constants.h" 43 #include "google_apis/gaia/gaia_constants.h"
43 #include "grit/generated_resources.h" 44 #include "grit/generated_resources.h"
44 #include "net/url_request/url_request_context_getter.h" 45 #include "net/url_request/url_request_context_getter.h"
45 #include "policy/policy_constants.h" 46 #include "policy/policy_constants.h"
46 #include "third_party/icu/source/i18n/unicode/regex.h" 47 #include "third_party/icu/source/i18n/unicode/regex.h"
47 #include "url/gurl.h" 48 #include "url/gurl.h"
48 49
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 string16 pattern = WideToUTF16(kNonManagedDomainPatterns[i]); 496 string16 pattern = WideToUTF16(kNonManagedDomainPatterns[i]);
496 if (MatchDomain(domain, pattern)) 497 if (MatchDomain(domain, pattern))
497 return true; 498 return true;
498 } 499 }
499 return false; 500 return false;
500 } 501 }
501 502
502 // static 503 // static
503 void BrowserPolicyConnector::RegisterPrefs(PrefRegistrySimple* registry) { 504 void BrowserPolicyConnector::RegisterPrefs(PrefRegistrySimple* registry) {
504 registry->RegisterIntegerPref( 505 registry->RegisterIntegerPref(
505 prefs::kUserPolicyRefreshRate, 506 policy_prefs::kUserPolicyRefreshRate,
506 CloudPolicyRefreshScheduler::kDefaultRefreshDelayMs); 507 CloudPolicyRefreshScheduler::kDefaultRefreshDelayMs);
507 #if defined(OS_CHROMEOS) 508 #if defined(OS_CHROMEOS)
508 registry->RegisterIntegerPref( 509 registry->RegisterIntegerPref(
509 prefs::kDevicePolicyRefreshRate, 510 prefs::kDevicePolicyRefreshRate,
510 CloudPolicyRefreshScheduler::kDefaultRefreshDelayMs); 511 CloudPolicyRefreshScheduler::kDefaultRefreshDelayMs);
511 #endif 512 #endif
512 } 513 }
513 514
514 void BrowserPolicyConnector::SetTimezoneIfPolicyAvailable() { 515 void BrowserPolicyConnector::SetTimezoneIfPolicyAvailable() {
515 #if defined(OS_CHROMEOS) 516 #if defined(OS_CHROMEOS)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 return new AsyncPolicyProvider(loader.Pass()); 559 return new AsyncPolicyProvider(loader.Pass());
559 } else { 560 } else {
560 return NULL; 561 return NULL;
561 } 562 }
562 #else 563 #else
563 return NULL; 564 return NULL;
564 #endif 565 #endif
565 } 566 }
566 567
567 } // namespace policy 568 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc ('k') | chrome/browser/policy/cloud/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698