Site Settings Desktop: Support adding exceptions for incognito mode.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 930 matching lines @@
 }
 
 void ContentSettingsHandler::CompareMediaExceptionsWithFlash(
     ContentSettingsType type) {
   MediaSettingsInfo::ForOneType& settings = media_settings_->forType(type);
   HostContentSettingsMap* settings_map =
       HostContentSettingsMapFactory::GetForProfile(GetProfile());
 
   base::ListValue exceptions;
   site_settings::GetExceptionsFromHostContentSettingsMap(settings_map, type,
-                                                         web_ui(), &exceptions);
+      web_ui(), /*incognito=*/ false, &exceptions);

[stevenjb, 2016/09/02 15:54:01]

nit: We generally do: false /* incognito */,

[dschuyler, 2016/09/02 22:49:38]

Interesting, I got a different impression. Rather than 
discuss it here, I shared a doc with my understanding 
of the usage at:

https://docs.google.com/a/chromium.org/document/d/15rL7FMf24YO7hdHDkVXve8v7pr...

[stevenjb, 2016/09/02 23:23:03]

Caveat: This is entirely a nit, for discussion prurposes only:

Based on prevalence in the existing code. ~1000 examples of "false /*", 300
examples of "*/ false", and 500 examples of "*/false" (not an exact metric by
any means, but consistent with my impression of the code). So, take your pick.

(The one example in the style guide does show /*incognito=*/ false, but it's not
a specific rule, and I generally find prevalence a better argument than
interpretation of an example).

 
   settings.exceptions.clear();
   for (base::ListValue::const_iterator entry = exceptions.begin();
        entry != exceptions.end(); ++entry) {
     base::DictionaryValue* dict = nullptr;
     bool valid_dict = (*entry)->GetAsDictionary(&dict);
     DCHECK(valid_dict);
 
     std::string origin;
     std::string setting;
@@ skipping 124 matching lines @@
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, zoom_levels_exceptions);
 }
 
 void ContentSettingsHandler::UpdateExceptionsViewFromHostContentSettingsMap(
     ContentSettingsType type) {
   base::ListValue exceptions;
   HostContentSettingsMap* settings_map =
       HostContentSettingsMapFactory::GetForProfile(GetProfile());
   site_settings::GetExceptionsFromHostContentSettingsMap(settings_map, type,
-                                                         web_ui(), &exceptions);
+      web_ui(), /*incognito=*/ false, &exceptions);

[dschuyler, 2016/09/02 22:49:38]

nit: inside a parameter list (as an exception to
the normal spacing), spaces are not used in or
after the comment. Visually, it helps make the thing 
look like a single unit. This helps readability 
because parameters are set positionally. So:
 
Foo(settings_map, type, web_ui(), /*incognito=*/false, &exceptions);

is easier to see the five parameters.

E.g.

https://cs.chromium.org/search/?q=%5B%5E%5Cs%5D%3D%5C*/%5B%5E%5Cs%5D&sq=packa...

   base::StringValue type_string(
       site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
-
                                          type_string, exceptions);
 
   UpdateExceptionsViewFromOTRHostContentSettingsMap(type);
 
   // Fullscreen and mouse lock have no global settings to update.
   // TODO(mgiuca): Delete this after removing these content settings entirely
   // (https://crbug.com/591896).
   if (type == CONTENT_SETTINGS_TYPE_FULLSCREEN ||
       type == CONTENT_SETTINGS_TYPE_MOUSELOCK) {
     return;
@@ skipping 10 matching lines @@
   UpdateSettingDefaultFromModel(type);
 }
 
 void ContentSettingsHandler::UpdateExceptionsViewFromOTRHostContentSettingsMap(
     ContentSettingsType type) {
   const HostContentSettingsMap* otr_settings_map =
       HostContentSettingsMapFactory::GetForProfile(GetOTRProfile());
   if (!otr_settings_map)
     return;
   base::ListValue exceptions;
-  site_settings::GetExceptionsFromHostContentSettingsMap(
-      otr_settings_map, type, web_ui(), &exceptions);
+  site_settings::GetExceptionsFromHostContentSettingsMap(otr_settings_map, type,
+      web_ui(), /*incognito=*/ true, &exceptions);
   base::StringValue type_string(
       site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setOTRExceptions",
                                          type_string, exceptions);
 }
 
 void ContentSettingsHandler::RemoveExceptionFromHostContentSettingsMap(
     const base::ListValue* args,
     ContentSettingsType type) {
   std::string mode;
@@ skipping 361 matching lines @@
 
   // Exceptions apply only when the feature is enabled.
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunctionUnsafe(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options