Site Settings Desktop: Support adding exceptions for incognito mode.

chrome/browser/ui/webui/options/content_settings_handler.cc

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 071a24e705a6fa114f303c38f559900c879306e5..9c5b14b391b290e4f466b7352a14e725a93ef4af 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -947,8 +947,11 @@ void ContentSettingsHandler::CompareMediaExceptionsWithFlash(
       HostContentSettingsMapFactory::GetForProfile(GetProfile());
 
   base::ListValue exceptions;
-  site_settings::GetExceptionsFromHostContentSettingsMap(settings_map, type,
-                                                         web_ui(), &exceptions);
+  site_settings::GetExceptionsFromHostContentSettingsMap(
+      settings_map, type,
+      web_ui(),
+      false,  // Incognito.

[dschuyler, 2016/09/01 23:13:49]

We can use /* */ in the parameter list. That may allow this to be wrapped less.

  site_settings::GetExceptionsFromHostContentSettingsMap(settings_map, type, 
      web_ui(), /*incognito=*/false, &exceptions);

See "Function Argument Comments" in the C++ coding standard.

[Finnur, 2016/09/02 15:44:14]

Done.

+      &exceptions);
 
   settings.exceptions.clear();
   for (base::ListValue::const_iterator entry = exceptions.begin();
@@ -1092,8 +1095,11 @@ void ContentSettingsHandler::UpdateExceptionsViewFromHostContentSettingsMap(
   base::ListValue exceptions;
   HostContentSettingsMap* settings_map =
       HostContentSettingsMapFactory::GetForProfile(GetProfile());
-  site_settings::GetExceptionsFromHostContentSettingsMap(settings_map, type,
-                                                         web_ui(), &exceptions);
+  site_settings::GetExceptionsFromHostContentSettingsMap(
+      settings_map, type,
+      web_ui(),
+      false,  // Incognito.
+      &exceptions);
   base::StringValue type_string(
       site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
@@ -1129,7 +1135,11 @@ void ContentSettingsHandler::UpdateExceptionsViewFromOTRHostContentSettingsMap(
     return;
   base::ListValue exceptions;
   site_settings::GetExceptionsFromHostContentSettingsMap(
-      otr_settings_map, type, web_ui(), &exceptions);
+      otr_settings_map,
+      type,
+      web_ui(),
+      true,  // Incognito.
+      &exceptions);
   base::StringValue type_string(
       site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setOTRExceptions",