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

Unified Diff: chrome/browser/ui/webui/options/content_settings_handler.h

Issue 585953003: Fix a bug where ContentSettingsHandler did not listen for OTR content settings changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/content_settings_handler.h
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h
index a02fd2ea27ac25c85a1df3ce8e1677769a075259..ebc4b38dbd5f86a880f2fb2c8ad8906716211eae 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.h
+++ b/chrome/browser/ui/webui/options/content_settings_handler.h
@@ -232,6 +232,8 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
MediaSettingsInfo media_settings_;
scoped_ptr<content::HostZoomMap::Subscription> host_zoom_map_subscription_;
ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
+ ScopedObserver<HostContentSettingsMap, content_settings::Observer>
Bernhard Bauer 2014/09/19 18:18:50 You can use the other observer for this.
Daniel Nishi 2014/09/19 19:49:15 Done.
+ otr_observer_;
DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
};

Powered by Google App Engine
This is Rietveld 408576698