diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 11:47:56 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 11:47:56 +0000 |
| commit | a2b221a5a400cf5a39134c29ee3bcab297c7f977 (patch) | |
| tree | 3bba1a29a15bf9f5259c0e91ff004a67d810bb0e /chrome/renderer/extensions | |
| parent | 147f809faed46a296cd07c4a936d9d2005a2ce93 (diff) | |
| download | chromium_src-a2b221a5a400cf5a39134c29ee3bcab297c7f977.zip chromium_src-a2b221a5a400cf5a39134c29ee3bcab297c7f977.tar.gz chromium_src-a2b221a5a400cf5a39134c29ee3bcab297c7f977.tar.bz2 | |
Rename Feature::(UN)PRIVILEGED_CONTEXT to (UN)BLESSED_EXTENSION_CONTEXT.
Note that I haven't updated simliar terminology used throughout the existing
JSON schema files ("unprivileged": true) because that's slightly different, and
it's probably not worth worrying about now due to impending replacement of
that logic with Feature.
TEST=unit_test --gtest_filter=*Feature*
Review URL: http://codereview.chromium.org/9617040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127938 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions')
| -rw-r--r-- | chrome/renderer/extensions/chrome_v8_context.cc | 10 | ||||
| -rw-r--r-- | chrome/renderer/extensions/chrome_v8_context_set_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/extensions/extension_dispatcher.cc | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/chrome/renderer/extensions/chrome_v8_context.cc b/chrome/renderer/extensions/chrome_v8_context.cc index 6d59a19..8702081 100644 --- a/chrome/renderer/extensions/chrome_v8_context.cc +++ b/chrome/renderer/extensions/chrome_v8_context.cc @@ -28,11 +28,11 @@ const char kValidateAPI[] = "validateAPI"; std::string GetContextTypeDescription(Feature::Context context_type) { switch (context_type) { - case Feature::UNSPECIFIED_CONTEXT: return "unspecified"; - case Feature::PRIVILEGED_CONTEXT: return "privileged"; - case Feature::UNPRIVILEGED_CONTEXT: return "unprivileged"; - case Feature::CONTENT_SCRIPT_CONTEXT: return "content script"; - case Feature::WEB_PAGE_CONTEXT: return "web page"; + case Feature::UNSPECIFIED_CONTEXT: return "unspecified"; + case Feature::BLESSED_EXTENSION_CONTEXT: return "blessed extension"; + case Feature::UNBLESSED_EXTENSION_CONTEXT: return "unblessed extension"; + case Feature::CONTENT_SCRIPT_CONTEXT: return "content script"; + case Feature::WEB_PAGE_CONTEXT: return "web page"; } NOTREACHED(); return ""; diff --git a/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc b/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc index af7b17d..818e2cd 100644 --- a/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc +++ b/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc @@ -26,7 +26,7 @@ TEST(ChromeV8ContextSet, Lifecycle) { v8_context, frame, extension_id, - extensions::Feature::PRIVILEGED_CONTEXT); + extensions::Feature::BLESSED_EXTENSION_CONTEXT); context_set.Add(context); EXPECT_EQ(1u, context_set.GetAll().count(context)); diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc index 9f3e4f1..7e9e0c9 100644 --- a/chrome/renderer/extensions/extension_dispatcher.cc +++ b/chrome/renderer/extensions/extension_dispatcher.cc @@ -486,8 +486,8 @@ void ExtensionDispatcher::DidCreateScriptContext( case Feature::WEB_PAGE_CONTEXT: break; - case Feature::PRIVILEGED_CONTEXT: - case Feature::UNPRIVILEGED_CONTEXT: + case Feature::BLESSED_EXTENSION_CONTEXT: + case Feature::UNBLESSED_EXTENSION_CONTEXT: case Feature::CONTENT_SCRIPT_CONTEXT: module_system->Require("json_schema"); module_system->Require("event_bindings"); @@ -698,10 +698,10 @@ Feature::Context ExtensionDispatcher::ClassifyJavaScriptContext( return Feature::CONTENT_SCRIPT_CONTEXT; if (IsExtensionActive(extension_id)) - return Feature::PRIVILEGED_CONTEXT; + return Feature::BLESSED_EXTENSION_CONTEXT; if (extensions_.ExtensionBindingsAllowed(url_info)) - return Feature::UNPRIVILEGED_CONTEXT; + return Feature::UNBLESSED_EXTENSION_CONTEXT; if (url_info.url().is_valid()) return Feature::WEB_PAGE_CONTEXT; |