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

Unified Diff: chrome/browser/views/options/content_filter_page_view.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/views/options/content_filter_page_view.cc
diff --git a/chrome/browser/views/options/content_filter_page_view.cc b/chrome/browser/views/options/content_filter_page_view.cc
index 45720e31621f9b01459eecbea6a4e38285a2e129..e7664cf04585c182b1b8127a71278eca17748c3e 100644
--- a/chrome/browser/views/options/content_filter_page_view.cc
+++ b/chrome/browser/views/options/content_filter_page_view.cc
@@ -166,7 +166,11 @@ void ContentFilterPageView::ButtonPressed(views::Button* sender,
profile()->GetGeolocationContentSettingsMap()));
} else {
ExceptionsView::ShowExceptionsWindow(GetWindow()->GetNativeWindow(),
- profile()->GetHostContentSettingsMap(), content_type_);
+ profile()->GetHostContentSettingsMap(),
+ profile()->HasOffTheRecordProfile() ?
+ profile()->GetOffTheRecordProfile()->GetHostContentSettingsMap() :
+ NULL,
+ content_type_);
}
return;
}
« no previous file with comments | « chrome/browser/views/options/content_exceptions_table_view.cc ('k') | chrome/browser/views/options/exception_editor_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698