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

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

Issue 26512003: Removed --disable-cloud-policy-on-signin flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/cloud/user_policy_signin_service_factory.h" 5 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/policy/browser_policy_connector.h" 10 #include "chrome/browser/policy/browser_policy_connector.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 bool 83 bool
84 UserPolicySigninServiceFactory::ServiceIsCreatedWithBrowserContext() const { 84 UserPolicySigninServiceFactory::ServiceIsCreatedWithBrowserContext() const {
85 // Create this object when the profile is created so it can track any 85 // Create this object when the profile is created so it can track any
86 // user signin activity. 86 // user signin activity.
87 return true; 87 return true;
88 } 88 }
89 89
90 void UserPolicySigninServiceFactory::RegisterProfilePrefs( 90 void UserPolicySigninServiceFactory::RegisterProfilePrefs(
91 user_prefs::PrefRegistrySyncable* user_prefs) { 91 user_prefs::PrefRegistrySyncable* user_prefs) {
92 user_prefs->RegisterBooleanPref(
93 prefs::kDisableCloudPolicyOnSignin,
94 false,
95 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
96 #if defined(OS_ANDROID) 92 #if defined(OS_ANDROID)
97 user_prefs->RegisterInt64Pref( 93 user_prefs->RegisterInt64Pref(
98 prefs::kLastPolicyCheckTime, 94 prefs::kLastPolicyCheckTime,
99 0, 95 0,
100 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 96 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
101 #endif 97 #endif
102 } 98 }
103 99
104 } // namespace policy 100 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/cloud/user_policy_signin_service_base.cc ('k') | chrome/browser/prefs/command_line_pref_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698