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

Unified Diff: chrome/browser/gtk/options/content_filter_page_gtk.cc

Issue 2858032: Display content settings applying to the current otr session only. (Closed)
Patch Set: updates Created 10 years, 6 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/gtk/options/content_filter_page_gtk.cc
diff --git a/chrome/browser/gtk/options/content_filter_page_gtk.cc b/chrome/browser/gtk/options/content_filter_page_gtk.cc
index 522a9a1df09b2258d1c9fcacc8cfe297d561c141..ae568ab40c59611d151a145eb59f4edc49f84fb5 100644
--- a/chrome/browser/gtk/options/content_filter_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_filter_page_gtk.cc
@@ -184,9 +184,13 @@ void ContentFilterPageGtk::OnExceptionsClicked(GtkWidget* button) {
}
HostContentSettingsMap* settings_map =
profile()->GetHostContentSettingsMap();
+ HostContentSettingsMap* otr_settings_map =
+ profile()->HasOffTheRecordProfile() ?
+ profile()->GetOffTheRecordProfile()->GetHostContentSettingsMap() :
+ NULL;
ContentExceptionsWindowGtk::ShowExceptionsWindow(
GTK_WINDOW(gtk_widget_get_toplevel(button)),
- settings_map, content_type_);
+ settings_map, otr_settings_map, content_type_);
}
void ContentFilterPageGtk::OnPluginsPageLinkClicked(GtkWidget* button) {
« no previous file with comments | « chrome/browser/gtk/options/content_exceptions_window_gtk.cc ('k') | chrome/browser/gtk/options/cookie_filter_page_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698