Enable incognito_session_only preferences

chrome/browser/extensions/extension_preference_api.cc

 // Copyright (c) 2011 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/extensions/extension_preference_api.h"
 
 #include <map>
 
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
@@ skipping 22 matching lines @@
 const char kControlledByOtherExtensions[] = "ControlledByOtherExtensions";
 const char kControllableByThisExtension[] = "ControllableByThisExtension";
 const char kControlledByThisExtension[] = "ControlledByThisExtension";
 
 const char kIncognito[] = "incognito";
 const char kIncognitoSpecific[] = "incognitoSpecific";
 const char kScope[] = "scope";
 const char kLevelOfControl[] = "levelOfControl";
 const char kRegular[] = "regular";
 const char kIncognitoPersistent[] = "incognito_persistent";
+const char kIncognitoSessionOnly[] = "incognito_session_only";
 const char kValue[] = "value";
 
 const char kOnPrefChangeFormat[] =
     "preferences.%s.onChange";
 
 const char kIncognitoErrorMessage[] =
     "You do not have permission to access incognito preferences.";
 
+const char kIncognitoSessionOnlyErrorMessage[] =
+    "You cannot set 'session-only incognito' preferences when no incognito "

[Matt Perry, 2011/05/24 22:07:17]

Reword: "You cannot set a preference with scope 'incognito_session' when no
incognito window is open."

[battre, 2011/05/25 11:51:30]

Done.

+    "window exists.";
+
 const char kPermissionErrorMessage[] =
     "You do not have permission to access the preference '%s'. "
     "Be sure to declare in your manifest what permissions you need.";
 
 PrefMappingEntry kPrefMapping[] = {
   { "blockThirdPartyCookies",
     prefs::kBlockThirdPartyCookies,
     Extension::kContentSettingsPermission
   },
   { "enableReferrers",
@@ skipping 50 matching lines @@
     return kControllableByThisExtension;
 
   return kControlledByOtherExtensions;
 }
 
 extension_prefs_scope::Scope StringToScope(const std::string& s) {
   if (s == kRegular) {
     return extension_prefs_scope::kRegular;
   } else if (s == kIncognitoPersistent) {
     return extension_prefs_scope::kIncognitoPersistent;
+  } else if (s == kIncognitoSessionOnly) {
+    return extension_prefs_scope::kIncognitoSessionOnly;
   } else {
     // The extension API checks that no invalid string can be passed.
     NOTREACHED();
     return extension_prefs_scope::kRegular;
   }
 }
 
 class PrefMapping {
  public:
   static PrefMapping* GetInstance() {
@@ skipping 224 matching lines @@
 
 bool SetPreferenceFunction::RunImpl() {
   std::string pref_key;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &pref_key));
   DictionaryValue* details = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &details));
 
   Value* value = NULL;
   EXTENSION_FUNCTION_VALIDATE(details->Get(kValue, &value));
 
-  std::string scope = kRegular;
+  std::string scope_str = kRegular;
   if (details->HasKey(kScope))
-    EXTENSION_FUNCTION_VALIDATE(details->GetString(kScope, &scope));
+    EXTENSION_FUNCTION_VALIDATE(details->GetString(kScope, &scope_str));
 
-  // TODO(battre): add kIncognitoSessionOnly
-  bool incognito = (scope == kIncognitoPersistent);
+  extension_prefs_scope::Scope scope = StringToScope(scope_str);
+
+  bool incognito = (scope == extension_prefs_scope::kIncognitoPersistent ||
+                    scope == extension_prefs_scope::kIncognitoSessionOnly);
   if (incognito && !include_incognito()) {
     error_ = kIncognitoErrorMessage;
     return false;
   }
 
+  if (scope == extension_prefs_scope::kIncognitoSessionOnly &&
+      !profile_->HasOffTheRecordProfile()) {
+    error_ = kIncognitoSessionOnlyErrorMessage;
+    return false;
+  }
+
   std::string browser_pref;
   std::string permission;
   EXTENSION_FUNCTION_VALIDATE(
       PrefMapping::GetInstance()->FindBrowserPrefForExtensionPref(
           pref_key, &browser_pref, &permission));
   if (!GetExtension()->HasApiPermission(permission)) {
     error_ = base::StringPrintf(kPermissionErrorMessage, pref_key.c_str());
     return false;
   }
   ExtensionPrefs* prefs = profile_->GetExtensionService()->extension_prefs();
   const PrefService::Preference* pref =
       prefs->pref_service()->FindPreference(browser_pref.c_str());
   CHECK(pref);
   EXTENSION_FUNCTION_VALIDATE(value->GetType() == pref->GetType());
   PrefTransformerInterface* transformer =
       PrefMapping::GetInstance()->FindTransformerForBrowserPref(browser_pref);
   std::string error;
   bool bad_message = false;
   Value* browserPrefValue =
       transformer->ExtensionToBrowserPref(value, &error, &bad_message);
   if (!browserPrefValue) {
     error_ = error;
     bad_message_ = bad_message;
     return false;
   }
   prefs->SetExtensionControlledPref(extension_id(),
                                     browser_pref,
-                                    StringToScope(scope),
+                                    scope,
                                     browserPrefValue);
   return true;
 }
 
 ClearPreferenceFunction::~ClearPreferenceFunction() { }
 
 bool ClearPreferenceFunction::RunImpl() {
   std::string pref_key;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &pref_key));
   DictionaryValue* details = NULL;
@@ skipping 13 matching lines @@
           pref_key, &browser_pref, &permission));
   if (!GetExtension()->HasApiPermission(permission)) {
     error_ = base::StringPrintf(kPermissionErrorMessage, pref_key.c_str());
     return false;
   }
   ExtensionPrefs* prefs = profile_->GetExtensionService()->extension_prefs();
   prefs->RemoveExtensionControlledPref(extension_id(), browser_pref,
                                        StringToScope(scope));
   return true;
 }