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

Side by Side Diff: trunk/src/chrome/browser/profiles/profile.cc

Issue 464673002: Revert 288817 "[Mac, Win] Only show the user manager tutorial if..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 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
« no previous file with comments | « no previous file | trunk/src/chrome/browser/profiles/profile_window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 #endif 195 #endif
196 #if defined(SPDY_PROXY_AUTH_ORIGIN) 196 #if defined(SPDY_PROXY_AUTH_ORIGIN)
197 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); 197 data_reduction_proxy::RegisterSyncableProfilePrefs(registry);
198 #endif // defined(SPDY_PROXY_AUTH_ORIGIN) 198 #endif // defined(SPDY_PROXY_AUTH_ORIGIN)
199 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) 199 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS)
200 // Preferences related to the avatar bubble and user manager tutorials. 200 // Preferences related to the avatar bubble and user manager tutorials.
201 registry->RegisterIntegerPref( 201 registry->RegisterIntegerPref(
202 prefs::kProfileAvatarTutorialShown, 202 prefs::kProfileAvatarTutorialShown,
203 0, 203 0,
204 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 204 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
205 registry->RegisterBooleanPref(
206 prefs::kProfileUserManagerTutorialShown,
207 false,
208 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
205 #endif 209 #endif
206 } 210 }
207 211
208 std::string Profile::GetDebugName() { 212 std::string Profile::GetDebugName() {
209 std::string name = GetPath().BaseName().MaybeAsASCII(); 213 std::string name = GetPath().BaseName().MaybeAsASCII();
210 if (name.empty()) { 214 if (name.empty()) {
211 name = "UnknownProfile"; 215 name = "UnknownProfile";
212 } 216 }
213 return name; 217 return name;
214 } 218 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 content::NotificationService::NoDetails()); 255 content::NotificationService::NoDetails());
252 } 256 }
253 } 257 }
254 258
255 bool ProfileCompare::operator()(Profile* a, Profile* b) const { 259 bool ProfileCompare::operator()(Profile* a, Profile* b) const {
256 DCHECK(a && b); 260 DCHECK(a && b);
257 if (a->IsSameProfile(b)) 261 if (a->IsSameProfile(b))
258 return false; 262 return false;
259 return a->GetOriginalProfile() < b->GetOriginalProfile(); 263 return a->GetOriginalProfile() < b->GetOriginalProfile();
260 } 264 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/profiles/profile_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698