Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index 6615e8a6d1a86fd54dd8a79adfbdabcf371924ae..6c3c71e38e90b61593a86db3f965d05b8be71eea 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -594,10 +594,23 @@ void ProfileImpl::InitHostZoomMap() { |
bool success = host_zoom_dictionary->GetDoubleWithoutPathExpansion( |
host, &zoom_level); |
DCHECK(success); |
- host_zoom_map->SetZoomLevel(host, zoom_level); |
+ host_zoom_map->SetZoomLevel(std::string(), host, zoom_level); |
} |
} |
+#if defined(OS_CHROMEOS) |
+ double no_zoom = 0; |
+ host_zoom_map->SetZoomLevel(chrome::kChromeUIUberHost, |
+ chrome::kChromeUIOobeHost, |
+ no_zoom); |
+ host_zoom_map->SetZoomLevel(chrome::kChromeUIUberHost, |
+ chrome::kChromeUILoginHost, |
+ no_zoom); |
+ host_zoom_map->SetZoomLevel(chrome::kChromeUIUberHost, |
+ chrome::kChromeUILockScreenHost, |
+ no_zoom); |
+#endif |
+ |
registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED, |
content::Source<HostZoomMap>(host_zoom_map)); |
} |
@@ -960,7 +973,7 @@ void ProfileImpl::Observe(int type, |
*(content::Details<const std::string>(details).ptr()); |
if (!host.empty()) { |
HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this); |
- double level = host_zoom_map->GetZoomLevel(host); |
+ double level = host_zoom_map->GetZoomLevel(std::string(), host); |
DictionaryPrefUpdate update(prefs_.get(), prefs::kPerHostZoomLevels); |
DictionaryValue* host_zoom_dictionary = update.Get(); |
if (level == host_zoom_map->GetDefaultZoomLevel()) { |