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

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

Issue 2660333004: Revert of Migrate external protocol prefs from local state to profiles (Closed)
Patch Set: Created 3 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
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 "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 registry->RegisterBooleanPref( 169 registry->RegisterBooleanPref(
170 prefs::kMediaRouterFirstRunFlowAcknowledged, 170 prefs::kMediaRouterFirstRunFlowAcknowledged,
171 false, 171 false,
172 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 172 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
173 registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources); 173 registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources);
174 #endif 174 #endif
175 175
176 #if defined(OS_CHROMEOS) 176 #if defined(OS_CHROMEOS)
177 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true); 177 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true);
178 #endif 178 #endif
179
180 registry->RegisterDictionaryPref(prefs::kExcludedSchemes);
181 } 179 }
182 180
183 std::string Profile::GetDebugName() { 181 std::string Profile::GetDebugName() {
184 std::string name = GetPath().BaseName().MaybeAsASCII(); 182 std::string name = GetPath().BaseName().MaybeAsASCII();
185 if (name.empty()) { 183 if (name.empty()) {
186 name = "UnknownProfile"; 184 name = "UnknownProfile";
187 } 185 }
188 return name; 186 return name;
189 } 187 }
190 188
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 if (a->IsSameProfile(b)) 239 if (a->IsSameProfile(b))
242 return false; 240 return false;
243 return a->GetOriginalProfile() < b->GetOriginalProfile(); 241 return a->GetOriginalProfile() < b->GetOriginalProfile();
244 } 242 }
245 243
246 double Profile::GetDefaultZoomLevelForProfile() { 244 double Profile::GetDefaultZoomLevelForProfile() {
247 return GetDefaultStoragePartition(this) 245 return GetDefaultStoragePartition(this)
248 ->GetHostZoomMap() 246 ->GetHostZoomMap()
249 ->GetDefaultZoomLevel(); 247 ->GetDefaultZoomLevel();
250 } 248 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_test_utils.cc ('k') | chrome/browser/ui/cocoa/external_protocol_dialog_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698