Index: chrome/browser/profiles/profile.cc |
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc |
index 9f9fbd8739bf64c1d04d36b78181d81619f29e07..df7e111b6aad4ad62e76a4182a0f9e437603326e 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() { |
} |
@@ -138,12 +142,21 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
prefs::kSelectFileLastDirectory, |
std::string(), |
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ // TODO(wjmaclean): remove the following two prefs once migration to per- |
+ // partition zoom is complete. |
registry->RegisterDoublePref( |
- prefs::kDefaultZoomLevel, |
+ prefs::kDefaultZoomLevelDeprecated, |
0.0, |
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
registry->RegisterDictionaryPref( |
- prefs::kPerHostZoomLevels, |
+ prefs::kPerHostZoomLevelsDeprecated, |
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ |
+ registry->RegisterDictionaryPref( |
+ prefs::kPartitionDefaultZoomLevel, |
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry->RegisterDictionaryPref( |
+ prefs::kPartitionPerHostZoomLevels, |
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
registry->RegisterStringPref( |
prefs::kDefaultApps, |