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

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

Issue 2630583002: Add setting to isolate zoom changes by default. (Closed)
Patch Set: ... and tell closure_compiler. 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827. 111 // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827.
112 registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, true); 112 registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, true);
113 registry->RegisterBooleanPref(prefs::kDisableExtensions, false); 113 registry->RegisterBooleanPref(prefs::kDisableExtensions, false);
114 #if BUILDFLAG(ENABLE_EXTENSIONS) 114 #if BUILDFLAG(ENABLE_EXTENSIONS)
115 registry->RegisterBooleanPref(extensions::pref_names::kAlertsInitialized, 115 registry->RegisterBooleanPref(extensions::pref_names::kAlertsInitialized,
116 false); 116 false);
117 #endif 117 #endif
118 registry->RegisterStringPref(prefs::kSelectFileLastDirectory, std::string()); 118 registry->RegisterStringPref(prefs::kSelectFileLastDirectory, std::string());
119 registry->RegisterDictionaryPref(prefs::kPartitionDefaultZoomLevel); 119 registry->RegisterDictionaryPref(prefs::kPartitionDefaultZoomLevel);
120 registry->RegisterDictionaryPref(prefs::kPartitionPerHostZoomLevels); 120 registry->RegisterDictionaryPref(prefs::kPartitionPerHostZoomLevels);
121 registry->RegisterDictionaryPref(prefs::kPartitionZoomScopeIsPerOrigin);
121 registry->RegisterStringPref(prefs::kDefaultApps, "install"); 122 registry->RegisterStringPref(prefs::kDefaultApps, "install");
122 registry->RegisterBooleanPref(prefs::kSpeechRecognitionFilterProfanities, 123 registry->RegisterBooleanPref(prefs::kSpeechRecognitionFilterProfanities,
123 true); 124 true);
124 registry->RegisterIntegerPref(prefs::kProfileIconVersion, 0); 125 registry->RegisterIntegerPref(prefs::kProfileIconVersion, 0);
125 registry->RegisterBooleanPref(prefs::kAllowDinosaurEasterEgg, true); 126 registry->RegisterBooleanPref(prefs::kAllowDinosaurEasterEgg, true);
126 #if defined(OS_CHROMEOS) 127 #if defined(OS_CHROMEOS)
127 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both 128 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both
128 // local state and user's profile. For other platforms we maintain 129 // local state and user's profile. For other platforms we maintain
129 // kApplicationLocale only in local state. 130 // kApplicationLocale only in local state.
130 // In the future we may want to maintain kApplicationLocale 131 // In the future we may want to maintain kApplicationLocale
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 if (a->IsSameProfile(b)) 243 if (a->IsSameProfile(b))
243 return false; 244 return false;
244 return a->GetOriginalProfile() < b->GetOriginalProfile(); 245 return a->GetOriginalProfile() < b->GetOriginalProfile();
245 } 246 }
246 247
247 double Profile::GetDefaultZoomLevelForProfile() { 248 double Profile::GetDefaultZoomLevelForProfile() {
248 return GetDefaultStoragePartition(this) 249 return GetDefaultStoragePartition(this)
249 ->GetHostZoomMap() 250 ->GetHostZoomMap()
250 ->GetDefaultZoomLevel(); 251 ->GetDefaultZoomLevel();
251 } 252 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698