diff options
author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 21:15:16 +0000 |
---|---|---|
committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 21:15:16 +0000 |
commit | 9a28f13d854c19ae09e2f2e260a2ddc366aef355 (patch) | |
tree | 15e513c433c89c64bd52f4e3c59de355e83696c2 /chrome/browser/extensions/extension_preference_api.cc | |
parent | dfb26435674c4ab5e9bb003b7a9355ba52b624bb (diff) | |
download | chromium_src-9a28f13d854c19ae09e2f2e260a2ddc366aef355.zip chromium_src-9a28f13d854c19ae09e2f2e260a2ddc366aef355.tar.gz chromium_src-9a28f13d854c19ae09e2f2e260a2ddc366aef355.tar.bz2 |
Added LevelOfControl to Preferences API's get() result
BUG=73427
TEST=./unit_tests --gtest_filter="PrefValueStoreTest.*" && ./unit_tests --gtest_filter="ExtensionPrefValueMapTest.*" && ./browser_tests --gtest_filter=ExtensionApiTest.IncognitoContentSettings && ./browser_tests --gtest_filter=ExtensionApiTest.ContentSettings
Review URL: http://codereview.chromium.org/6542021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_preference_api.cc')
-rw-r--r-- | chrome/browser/extensions/extension_preference_api.cc | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_preference_api.cc b/chrome/browser/extensions/extension_preference_api.cc index 1652634..7472e41 100644 --- a/chrome/browser/extensions/extension_preference_api.cc +++ b/chrome/browser/extensions/extension_preference_api.cc @@ -20,6 +20,11 @@ struct PrefMappingEntry { const char* permission; }; +const char kNotControllable[] = "NotControllable"; +const char kControlledByOtherExtensions[] = "ControlledByOtherExtensions"; +const char kControllableByThisExtension[] = "ControllableByThisExtension"; +const char kControlledByThisExtension[] = "ControlledByThisExtension"; + PrefMappingEntry pref_mapping[] = { { "blockThirdPartyCookies", prefs::kBlockThirdPartyCookies, @@ -74,6 +79,28 @@ const char kPermissionErrorMessage[] = GetPreferenceFunction::~GetPreferenceFunction() { } +const char* GetPreferenceFunction::GetLevelOfControl( + const std::string& browser_pref, + bool incognito) const { + PrefService* prefs = incognito ? profile_->GetOffTheRecordPrefs() + : profile_->GetPrefs(); + const PrefService::Preference* pref = + prefs->FindPreference(browser_pref.c_str()); + CHECK(pref); + ExtensionPrefs* ep = profile_->GetExtensionService()->extension_prefs(); + + if (!pref->IsExtensionModifiable()) + return kNotControllable; + + if (ep->DoesExtensionControlPref(extension_id(), browser_pref, incognito)) + return kControlledByThisExtension; + + if (ep->CanExtensionControlPref(extension_id(), browser_pref, incognito)) + return kControllableByThisExtension; + + return kControlledByOtherExtensions; +} + bool GetPreferenceFunction::RunImpl() { std::string pref_key; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &pref_key)); @@ -95,10 +122,16 @@ bool GetPreferenceFunction::RunImpl() { error_ = base::StringPrintf(kPermissionErrorMessage, pref_key.c_str()); return false; } + const PrefService::Preference* pref = prefs->FindPreference(browser_pref.c_str()); CHECK(pref); - result_.reset(pref->GetValue()->DeepCopy()); + std::string level_of_control = GetLevelOfControl(browser_pref, incognito); + + scoped_ptr<DictionaryValue> result(new DictionaryValue); + result->Set("value", pref->GetValue()->DeepCopy()); + result->Set("levelOfControl", Value::CreateStringValue(level_of_control)); + result_.reset(result.release()); return true; } |