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

Side by Side Diff: chrome/browser/profiles/gaia_info_update_service.cc

Issue 12088040: Add a SigninAllowed policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Extract managed user specific stuff into another changelist. Created 7 years, 10 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/profiles/gaia_info_update_service.h" 5 #include "chrome/browser/profiles/gaia_info_update_service.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/prefs/pref_service.h" 9 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 profile_image_downloader_->Start(); 57 profile_image_downloader_->Start();
58 } 58 }
59 59
60 // static 60 // static
61 bool GAIAInfoUpdateService::ShouldUseGAIAProfileInfo(Profile* profile) { 61 bool GAIAInfoUpdateService::ShouldUseGAIAProfileInfo(Profile* profile) {
62 #if defined(OS_CHROMEOS) 62 #if defined(OS_CHROMEOS)
63 return false; 63 return false;
64 #endif 64 #endif
65 65
66 // Sync must be allowed. 66 // Sync must be allowed.
67 if (!profile->GetOriginalProfile()->IsSyncAccessible()) 67 if (!profile->GetOriginalProfile()->IsSyncAccessible() ||
68 !profile->GetOriginalProfile()->IsSigninAllowed())
sail 2013/02/08 20:18:57 Why this change?
Adrian Kuegel 2013/02/11 16:47:30 I thought that "No Signin" should imply "No Sync"
68 return false; 69 return false;
69 70
70 // To enable this feature for testing pass "--gaia-profile-info". 71 // To enable this feature for testing pass "--gaia-profile-info".
71 if (CommandLine::ForCurrentProcess()->HasSwitch( 72 if (CommandLine::ForCurrentProcess()->HasSwitch(
72 switches::kGaiaProfileInfo)) { 73 switches::kGaiaProfileInfo)) {
73 return true; 74 return true;
74 } 75 }
75 76
76 // This feature is disable by default. 77 // This feature is disable by default.
77 return false; 78 return false;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 const base::TimeDelta update_delta = base::Time::Now() - last_updated_; 194 const base::TimeDelta update_delta = base::Time::Now() - last_updated_;
194 195
195 base::TimeDelta delta; 196 base::TimeDelta delta;
196 if (update_delta < base::TimeDelta() || update_delta > desired_delta) 197 if (update_delta < base::TimeDelta() || update_delta > desired_delta)
197 delta = base::TimeDelta::FromSeconds(kMinUpdateIntervalSeconds); 198 delta = base::TimeDelta::FromSeconds(kMinUpdateIntervalSeconds);
198 else 199 else
199 delta = desired_delta - update_delta; 200 delta = desired_delta - update_delta;
200 201
201 timer_.Start(FROM_HERE, delta, this, &GAIAInfoUpdateService::Update); 202 timer_.Start(FROM_HERE, delta, this, &GAIAInfoUpdateService::Update);
202 } 203 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698