Content settings: allow "session only" type for cookies exceptions

chrome/browser/dom_ui/content_settings_handler.cc

 // Copyright (c) 2010 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/dom_ui/content_settings_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 54 matching lines @@
 }
 
 std::string ContentSettingToString(ContentSetting setting) {
   switch (setting) {
     case CONTENT_SETTING_ALLOW:
       return "allow";
     case CONTENT_SETTING_ASK:
       return "ask";
     case CONTENT_SETTING_BLOCK:
       return "block";
+    case CONTENT_SETTING_SESSION_ONLY:
+      return "session";
 
     default:
       NOTREACHED();
       return "";
   }
 }
 
 ContentSetting ContentSettingFromString(const std::string& name) {
   if (name == "allow")
     return CONTENT_SETTING_ALLOW;
   if (name == "ask")
     return CONTENT_SETTING_ASK;
   if (name == "block")
     return CONTENT_SETTING_BLOCK;
+  if (name == "session")
+    return CONTENT_SETTING_SESSION_ONLY;
 
   NOTREACHED();
   return CONTENT_SETTING_DEFAULT;
 }
 
 }  // namespace
 
 ContentSettingsHandler::ContentSettingsHandler() {
 }
 
 ContentSettingsHandler::~ContentSettingsHandler() {
 }
 
 void ContentSettingsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   localized_strings->SetString("content_exceptions",
       l10n_util::GetStringUTF16(IDS_COOKIES_EXCEPTIONS_BUTTON));
   localized_strings->SetString("contentSettingsPage",
       l10n_util::GetStringUTF16(IDS_CONTENT_SETTINGS_TITLE));
   localized_strings->SetString("allowException",
       l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON));
   localized_strings->SetString("blockException",
       l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON));
+  localized_strings->SetString("sessionException",
+      l10n_util::GetStringUTF16(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON));
   localized_strings->SetString("addExceptionRow",
       l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ADD_BUTTON));
   localized_strings->SetString("removeExceptionRow",
       l10n_util::GetStringUTF16(IDS_EXCEPTIONS_REMOVE_BUTTON));
   localized_strings->SetString("editExceptionRow",
       l10n_util::GetStringUTF16(IDS_EXCEPTIONS_EDIT_BUTTON));
 
   // Cookies filter.
   localized_strings->SetString("cookies_tab_label",
       l10n_util::GetStringUTF16(IDS_COOKIES_TAB_LABEL));
@@ skipping 248 matching lines @@
   scoped_ptr<Value> pattern_value(Value::CreateStringValue(
       pattern_string));
   scoped_ptr<Value> valid_value(Value::CreateBooleanValue(
       pattern.IsValid()));
 
   dom_ui_->CallJavascriptFunction(
       L"ContentSettings.patternValidityCheckComplete", *type,
                                                        *pattern_value.get(),
                                                        *valid_value.get());
 }