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

Unified Diff: chrome/browser/cocoa/content_settings_dialog_controller.mm

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/cocoa/content_settings_dialog_controller.mm
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.mm b/chrome/browser/cocoa/content_settings_dialog_controller.mm
index a981a0fc47b52b67df1428a97a6b73befb424a21..40fceae95a8f0006e165922d971d62d8cf8f7623 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller.mm
+++ b/chrome/browser/cocoa/content_settings_dialog_controller.mm
@@ -333,8 +333,13 @@ class PrefObserverDisabler {
- (void)showExceptionsForType:(ContentSettingsType)settingsType {
HostContentSettingsMap* settingsMap = profile_->GetHostContentSettingsMap();
+ HostContentSettingsMap* offTheRecordSettingsMap =
+ profile_->HasOffTheRecordProfile() ?
+ profile_->GetOffTheRecordProfile()->GetHostContentSettingsMap() :
+ NULL;
[[ContentExceptionsWindowController controllerForType:settingsType
- settingsMap:settingsMap]
+ settingsMap:settingsMap
+ otrSettingsMap:offTheRecordSettingsMap]
attachSheetTo:[self window]];
}
« no previous file with comments | « chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm ('k') | chrome/browser/content_exceptions_table_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698