Add Cookie permission to Website Settings single side view.

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

 // Copyright 2014 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/website_settings_handler.h"
 
 #include "apps/app_window_registry.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 11 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/text/bytes_formatting.h"
 
 namespace {
 
 const int kHttpPort = 80;
 const int kHttpsPort = 443;
 const char kPreferencesSource[] = "preference";
 const char kStorage[] = "storage";
-const ContentSettingsType kValidTypes[] = {CONTENT_SETTINGS_TYPE_GEOLOCATION,
-                                           CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
-                                           CONTENT_SETTINGS_TYPE_MEDIASTREAM};
+const ContentSettingsType kValidTypes[] = {
+    CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,

[Bernhard Bauer, 2014/08/26 08:12:27]

Put each on an individual line.

[Daniel Nishi, 2014/08/26 17:26:50]

Done.

+    CONTENT_SETTINGS_TYPE_MEDIASTREAM, CONTENT_SETTINGS_TYPE_COOKIES};
 const size_t kValidTypesLength = arraysize(kValidTypes);
 }  // namespace
 
 namespace options {
 
 WebsiteSettingsHandler::WebsiteSettingsHandler()
     : observer_(this), weak_ptr_factory_(this) {
 }
 
 WebsiteSettingsHandler::~WebsiteSettingsHandler() {
 }
 
 void WebsiteSettingsHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
       {"websitesOptionsPageTabTitle", IDS_WEBSITE_SETTINGS_TITLE},
       {"websitesSettingsEditPage", IDS_WEBSITE_SETTINGS_EDIT_TITLE},
       {"websitesManage", IDS_WEBSITE_SETTINGS_MANAGE},
       {"websitesSearch", IDS_WEBSITE_SETTINGS_SEARCH_ORIGINS},
       {"websitesLabelGeolocation", IDS_WEBSITE_SETTINGS_TYPE_LOCATION},
       {"websitesLabelMediaStream", IDS_WEBSITE_SETTINGS_TYPE_MEDIASTREAM},
       {"websitesLabelNotifications", IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS},
       {"websitesLabelStorage", IDS_WEBSITE_SETTINGS_TYPE_STORAGE},
+      {"websitesCookiesDescription", IDS_WEBSITE_SETTINGS_COOKIES_DESCRIPTION},
       {"websitesLocationDescription",
        IDS_WEBSITE_SETTINGS_LOCATION_DESCRIPTION},
       {"websitesMediastreamDescription",
        IDS_WEBSITE_SETTINGS_MEDIASTREAM_DESCRIPTION},
       {"websitesNotificationsDescription",
        IDS_WEBSITE_SETTINGS_NOTIFICATIONS_DESCRIPTION},
       {"websitesButtonClear", IDS_WEBSITE_SETTINGS_STORAGE_CLEAR_BUTTON},
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
@@ skipping 231 matching lines @@
       map->GetDefaultContentSetting(settings_type, NULL);
 
   // Users are not allowed to be the source of the "ask" setting. It is an
   // ephemeral setting which is removed once the question is asked.
   if (setting == CONTENT_SETTING_ASK && setting == default_value)
     setting = CONTENT_SETTING_DEFAULT;
 
   ContentSettingsPattern primary_pattern;
   ContentSettingsPattern secondary_pattern;
   switch (settings_type) {
+    case CONTENT_SETTINGS_TYPE_COOKIES:
+      primary_pattern = ContentSettingsPattern::FromURLNoWildcard(last_site_);
+      secondary_pattern = ContentSettingsPattern::FromURLNoWildcard(last_site_);
+      break;
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       primary_pattern = ContentSettingsPattern::FromURLNoWildcard(last_site_);
       secondary_pattern = ContentSettingsPattern::Wildcard();
       break;
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       primary_pattern = ContentSettingsPattern::FromURLNoWildcard(last_site_);
       secondary_pattern = ContentSettingsPattern::FromURLNoWildcard(last_site_);
       break;
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
       primary_pattern = ContentSettingsPattern::FromURLNoWildcard(last_site_);
@@ skipping 61 matching lines @@
         map->GetDefaultContentSetting(permission_type, NULL);
     if (default_value != CONTENT_SETTING_ALLOW &&
         default_value != CONTENT_SETTING_BLOCK) {
       options->AppendString(
           content_settings::ContentSettingToString(default_value));
     }
     options->AppendString(
         content_settings::ContentSettingToString(CONTENT_SETTING_ALLOW));
     options->AppendString(
         content_settings::ContentSettingToString(CONTENT_SETTING_BLOCK));
+    if (permission_type == CONTENT_SETTINGS_TYPE_COOKIES)

[Bernhard Bauer, 2014/08/26 08:12:27]

Wrap multiline bodies in braces.

[Daniel Nishi, 2014/08/26 17:26:50]

Done.

+      options->AppendString(content_settings::ContentSettingToString(
+          CONTENT_SETTING_SESSION_ONLY));
 
     ContentSetting permission;
     content_settings::SettingInfo info;
     if (permission_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM) {
       scoped_ptr<base::Value> mic_value(
           map->GetWebsiteSetting(site_url,
                                  site_url,
                                  CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
                                  std::string(),
                                  &info));
@@ skipping 97 matching lines @@
 
   // Load a new BrowsingDataLocalStorageHelper to update.
   local_storage_ = new BrowsingDataLocalStorageHelper(profile);
 
   local_storage_->StartFetching(
       base::Bind(&WebsiteSettingsHandler::OnLocalStorageFetched,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 }  // namespace options