Chromium Code Reviews| Index: chrome/browser/profiles/profile.cc |
| diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc |
| index 86326aa08254a89069e62c9a11413e3bb6e9d9d3..f2e29b3d7690643dd7b2eba07f7499044bd6650d 100644 |
| --- a/chrome/browser/profiles/profile.cc |
| +++ b/chrome/browser/profiles/profile.cc |
| @@ -60,6 +60,10 @@ TestingProfile* Profile::AsTestingProfile() { |
| return NULL; |
| } |
| +chrome::ChromeZoomLevelPrefs* Profile::GetZoomLevelPrefs() { |
| + return NULL; |
| +} |
| + |
| Profile::Delegate::~Delegate() { |
| } |
| @@ -136,11 +140,27 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| prefs::kSelectFileLastDirectory, |
| std::string(), |
| user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| + // TODO(wjmaclean): remove the following pref once migration to per-partition |
| + // zoom is complete. |
| registry->RegisterDoublePref( |
| - prefs::kDefaultZoomLevel, |
| + prefs::kProfileDefaultZoomLevel, |
|
Bernhard Bauer
2014/10/01 15:09:14
This is what I meant in my email: You're registeri
wjmaclean
2014/10/01 20:32:59
I assume this comment was intended for line 151 (b
|
| + 0.0, |
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| + std::string default_zoom_level_path(prefs::kDefaultZoomLevel); |
| + default_zoom_level_path.append(".0"); |
| + registry->RegisterDoublePref( |
| + default_zoom_level_path.c_str(), |
| 0.0, |
| user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| registry->RegisterDictionaryPref( |
| + prefs::kDefaultZoomLevel, |
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| + // TODO(wjmaclean): remove the following pref once migration to per-partition |
| + // zoom is complete. |
| + registry->RegisterDictionaryPref( |
| + prefs::kProfilePerHostZoomLevels, |
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| + registry->RegisterDictionaryPref( |
| prefs::kPerHostZoomLevels, |
| user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| registry->RegisterStringPref( |