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

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

Issue 938713004: Add Now setting and migration logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Conditionalize include Created 5 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 "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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 106 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
107 registry->RegisterDictionaryPref( 107 registry->RegisterDictionaryPref(
108 prefs::kSafeBrowsingIncidentsSent, 108 prefs::kSafeBrowsingIncidentsSent,
109 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 109 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
110 #if defined(ENABLE_GOOGLE_NOW) 110 #if defined(ENABLE_GOOGLE_NOW)
111 registry->RegisterBooleanPref( 111 registry->RegisterBooleanPref(
112 prefs::kGoogleGeolocationAccessEnabled, 112 prefs::kGoogleGeolocationAccessEnabled,
113 false, 113 false,
114 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 114 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
115 #endif 115 #endif
116 // This pref is intentionally outside the above #if. That flag corresponds
117 // to the Notifier extension and does not gate the launcher page.
118 // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827.
119 registry->RegisterBooleanPref(
120 prefs::kGoogleNowLauncherEnabled,
121 true,
122 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
116 registry->RegisterBooleanPref( 123 registry->RegisterBooleanPref(
117 prefs::kDisableExtensions, 124 prefs::kDisableExtensions,
118 false, 125 false,
119 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 126 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
120 #if defined(ENABLE_EXTENSIONS) 127 #if defined(ENABLE_EXTENSIONS)
121 registry->RegisterBooleanPref( 128 registry->RegisterBooleanPref(
122 extensions::pref_names::kAlertsInitialized, 129 extensions::pref_names::kAlertsInitialized,
123 false, 130 false,
124 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 131 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
125 #endif 132 #endif
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 if (a->IsSameProfile(b)) 263 if (a->IsSameProfile(b))
257 return false; 264 return false;
258 return a->GetOriginalProfile() < b->GetOriginalProfile(); 265 return a->GetOriginalProfile() < b->GetOriginalProfile();
259 } 266 }
260 267
261 double Profile::GetDefaultZoomLevelForProfile() { 268 double Profile::GetDefaultZoomLevelForProfile() {
262 return GetDefaultStoragePartition(this) 269 return GetDefaultStoragePartition(this)
263 ->GetHostZoomMap() 270 ->GetHostZoomMap()
264 ->GetDefaultZoomLevel(); 271 ->GetDefaultZoomLevel();
265 } 272 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/resources/options/browser_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698