OLD | NEW |
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_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 return false; | 129 return false; |
129 | 130 |
130 // Display the signin promo if the user is not signed in. | 131 // Display the signin promo if the user is not signed in. |
131 SigninManager* signin = SigninManagerFactory::GetForProfile( | 132 SigninManager* signin = SigninManagerFactory::GetForProfile( |
132 profile->GetOriginalProfile()); | 133 profile->GetOriginalProfile()); |
133 return signin->GetAuthenticatedUsername().empty(); | 134 return signin->GetAuthenticatedUsername().empty(); |
134 #endif | 135 #endif |
135 } | 136 } |
136 | 137 |
137 // static | 138 // static |
138 void SyncPromoUI::RegisterUserPrefs(PrefServiceSyncable* prefs) { | 139 void SyncPromoUI::RegisterUserPrefs(PrefRegistrySyncable* registry) { |
139 prefs->RegisterIntegerPref(prefs::kSyncPromoStartupCount, 0, | 140 registry->RegisterIntegerPref(prefs::kSyncPromoStartupCount, 0, |
140 PrefServiceSyncable::UNSYNCABLE_PREF); | 141 PrefRegistrySyncable::UNSYNCABLE_PREF); |
141 prefs->RegisterBooleanPref(prefs::kSyncPromoUserSkipped, false, | 142 registry->RegisterBooleanPref(prefs::kSyncPromoUserSkipped, false, |
142 PrefServiceSyncable::UNSYNCABLE_PREF); | 143 PrefRegistrySyncable::UNSYNCABLE_PREF); |
143 prefs->RegisterBooleanPref(prefs::kSyncPromoShowOnFirstRunAllowed, true, | 144 registry->RegisterBooleanPref(prefs::kSyncPromoShowOnFirstRunAllowed, true, |
144 PrefServiceSyncable::UNSYNCABLE_PREF); | 145 PrefRegistrySyncable::UNSYNCABLE_PREF); |
145 | 146 |
146 SyncPromoHandler::RegisterUserPrefs(prefs); | 147 SyncPromoHandler::RegisterUserPrefs(registry); |
147 } | 148 } |
148 | 149 |
149 // static | 150 // static |
150 bool SyncPromoUI::ShouldShowSyncPromoAtStartup(Profile* profile, | 151 bool SyncPromoUI::ShouldShowSyncPromoAtStartup(Profile* profile, |
151 bool is_new_profile) { | 152 bool is_new_profile) { |
152 DCHECK(profile); | 153 DCHECK(profile); |
153 | 154 |
154 if (!ShouldShowSyncPromo(profile)) | 155 if (!ShouldShowSyncPromo(profile)) |
155 return false; | 156 return false; |
156 | 157 |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 g_force_web_based_signin_flow; | 300 g_force_web_based_signin_flow; |
300 #else | 301 #else |
301 return false; | 302 return false; |
302 #endif | 303 #endif |
303 } | 304 } |
304 | 305 |
305 // static | 306 // static |
306 void SyncPromoUI::ForceWebBasedSigninFlowForTesting(bool force) { | 307 void SyncPromoUI::ForceWebBasedSigninFlowForTesting(bool force) { |
307 g_force_web_based_signin_flow = force; | 308 g_force_web_based_signin_flow = force; |
308 } | 309 } |
OLD | NEW |