Index: chrome/browser/ui/webui/options/content_settings_handler.cc |
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc |
index 531952ecab655c7044bc120379e1a04836c9766c..9771e203063ff94803715812c9cc606546ea091f 100644 |
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc |
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc |
@@ -515,12 +515,13 @@ void ContentSettingsHandler::InitializeHandler() { |
&ContentSettingsHandler::UpdateProtectedContentExceptionsButton, |
base::Unretained(this))); |
- content::HostZoomMap* host_zoom_map = |
- content::HostZoomMap::GetForBrowserContext(context); |
+ // Here we only subscribe to the HostZoomMap for the default storage partition |
+ // and we're only interested in non-temporary, host-only zoom levels. |
awong
2014/08/12 21:07:06
Needs more "why" in the comment. :)
wjmaclean
2014/08/13 17:16:03
Done.
|
host_zoom_map_subscription_ = |
- host_zoom_map->AddZoomLevelChangedCallback( |
- base::Bind(&ContentSettingsHandler::OnZoomLevelChanged, |
- base::Unretained(this))); |
+ content::HostZoomMap::GetForBrowserContext(context) |
+ ->AddZoomLevelChangedCallback( |
+ base::Bind(&ContentSettingsHandler::OnZoomLevelChanged, |
+ base::Unretained(this))); |
flash_settings_manager_.reset(new PepperFlashSettingsManager(this, context)); |
} |