Made all enums of preferences api unix_hacker_style

BUG=60099
TEST=no

Review URL: http://codereview.chromium.org/6987017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86745 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 4 deletions

diff --git a/chrome/browser/extensions/extension_preference_api.cc b/chrome/browser/extensions/extension_preference_api.cc
index 2759c89..ae65a58 100644
--- a/chrome/browser/extensions/extension_preference_api.cc
+++ b/chrome/browser/extensions/extension_preference_api.cc
@@ -29,10 +29,10 @@ struct PrefMappingEntry {
   const char* permission;
 };
 
-const char kNotControllable[] = "NotControllable";
-const char kControlledByOtherExtensions[] = "ControlledByOtherExtensions";
-const char kControllableByThisExtension[] = "ControllableByThisExtension";
-const char kControlledByThisExtension[] = "ControlledByThisExtension";
+const char kNotControllable[] = "not_controllable";
+const char kControlledByOtherExtensions[] = "controlled_by_other_extensions";
+const char kControllableByThisExtension[] = "controllable_by_this_extension";
+const char kControlledByThisExtension[] = "controlled_by_this_extension";
 
 const char kIncognito[] = "incognito";
 const char kIncognitoSpecific[] = "incognitoSpecific";
@@ -397,6 +397,12 @@ bool SetPreferenceFunction::RunImpl() {
     return false;
   }
 
+  if (scope == extension_prefs_scope::kIncognitoSessionOnly &&
+      !profile_->HasOffTheRecordProfile()) {
+    error_ = kIncognitoSessionOnlyErrorMessage;
+    return false;
+  }
+
   std::string browser_pref;
   std::string permission;
   EXTENSION_FUNCTION_VALIDATE(