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

Side by Side Diff: chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. 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/ui/webui/sync_promo/sync_promo_ui.h" 5 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/first_run/first_run.h" 13 #include "chrome/browser/first_run/first_run.h"
14 #include "chrome/browser/google/google_util.h" 14 #include "chrome/browser/google/google_util.h"
15 #include "chrome/browser/prefs/pref_registry_syncable.h"
15 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
16 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/profiles/profile_info_cache.h" 18 #include "chrome/browser/profiles/profile_info_cache.h"
18 #include "chrome/browser/profiles/profile_manager.h" 19 #include "chrome/browser/profiles/profile_manager.h"
19 #include "chrome/browser/signin/signin_manager.h" 20 #include "chrome/browser/signin/signin_manager.h"
20 #include "chrome/browser/signin/signin_manager_factory.h" 21 #include "chrome/browser/signin/signin_manager_factory.h"
21 #include "chrome/browser/sync/profile_sync_service.h" 22 #include "chrome/browser/sync/profile_sync_service.h"
22 #include "chrome/browser/sync/profile_sync_service_factory.h" 23 #include "chrome/browser/sync/profile_sync_service_factory.h"
23 #include "chrome/browser/ui/webui/options/core_options_handler.h" 24 #include "chrome/browser/ui/webui/options/core_options_handler.h"
24 #include "chrome/browser/ui/webui/sync_promo/sync_promo_handler.h" 25 #include "chrome/browser/ui/webui/sync_promo/sync_promo_handler.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 return false; 130 return false;
130 131
131 // Display the signin promo if the user is not signed in. 132 // Display the signin promo if the user is not signed in.
132 SigninManager* signin = SigninManagerFactory::GetForProfile( 133 SigninManager* signin = SigninManagerFactory::GetForProfile(
133 profile->GetOriginalProfile()); 134 profile->GetOriginalProfile());
134 return signin->GetAuthenticatedUsername().empty(); 135 return signin->GetAuthenticatedUsername().empty();
135 #endif 136 #endif
136 } 137 }
137 138
138 // static 139 // static
139 void SyncPromoUI::RegisterUserPrefs(PrefServiceSyncable* prefs) { 140 void SyncPromoUI::RegisterUserPrefs(PrefRegistrySyncable* registry) {
140 prefs->RegisterIntegerPref(prefs::kSyncPromoStartupCount, 0, 141 registry->RegisterIntegerPref(prefs::kSyncPromoStartupCount, 0,
141 PrefServiceSyncable::UNSYNCABLE_PREF); 142 PrefRegistrySyncable::UNSYNCABLE_PREF);
142 prefs->RegisterBooleanPref(prefs::kSyncPromoUserSkipped, false, 143 registry->RegisterBooleanPref(prefs::kSyncPromoUserSkipped, false,
143 PrefServiceSyncable::UNSYNCABLE_PREF); 144 PrefRegistrySyncable::UNSYNCABLE_PREF);
144 prefs->RegisterBooleanPref(prefs::kSyncPromoShowOnFirstRunAllowed, true, 145 registry->RegisterBooleanPref(prefs::kSyncPromoShowOnFirstRunAllowed, true,
145 PrefServiceSyncable::UNSYNCABLE_PREF); 146 PrefRegistrySyncable::UNSYNCABLE_PREF);
146 147
147 SyncPromoHandler::RegisterUserPrefs(prefs); 148 SyncPromoHandler::RegisterUserPrefs(registry);
148 } 149 }
149 150
150 // static 151 // static
151 bool SyncPromoUI::ShouldShowSyncPromoAtStartup(Profile* profile, 152 bool SyncPromoUI::ShouldShowSyncPromoAtStartup(Profile* profile,
152 bool is_new_profile) { 153 bool is_new_profile) {
153 DCHECK(profile); 154 DCHECK(profile);
154 155
155 if (!ShouldShowSyncPromo(profile)) 156 if (!ShouldShowSyncPromo(profile))
156 return false; 157 return false;
157 158
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 g_force_web_based_signin_flow; 301 g_force_web_based_signin_flow;
301 #else 302 #else
302 return false; 303 return false;
303 #endif 304 #endif
304 } 305 }
305 306
306 // static 307 // static
307 void SyncPromoUI::ForceWebBasedSigninFlowForTesting(bool force) { 308 void SyncPromoUI::ForceWebBasedSigninFlowForTesting(bool force) {
308 g_force_web_based_signin_flow = force; 309 g_force_web_based_signin_flow = force;
309 } 310 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/sync_promo/sync_promo_ui.h ('k') | chrome/browser/web_resource/notification_promo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698