diff options
author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 01:44:25 +0000 |
---|---|---|
committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 01:44:25 +0000 |
commit | d98f697a09b1eab58701d7d0e69275ee7f375104 (patch) | |
tree | 1024b5a512ee8410d9b75373a793d4141a0aa24e /chrome/renderer | |
parent | ad80964d20f458d2b34f95177a8c391ffb36e3d5 (diff) | |
download | chromium_src-d98f697a09b1eab58701d7d0e69275ee7f375104.zip chromium_src-d98f697a09b1eab58701d7d0e69275ee7f375104.tar.gz chromium_src-d98f697a09b1eab58701d7d0e69275ee7f375104.tar.bz2 |
Take the Storage API out of experimental again; effectively a revert of 119854.
BUG=92589
TEST=browser_tests --gtest_filter=*ExtensionSettings* --gtest_also_run_disabled_tests
Review URL: http://codereview.chromium.org/9315023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r-- | chrome/renderer/extensions/custom_bindings_util.cc | 4 | ||||
-rw-r--r-- | chrome/renderer/renderer_resources.grd | 2 | ||||
-rw-r--r-- | chrome/renderer/resources/extensions/storage_custom_bindings.js (renamed from chrome/renderer/resources/extensions/experimental.storage_custom_bindings.js) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/renderer/extensions/custom_bindings_util.cc b/chrome/renderer/extensions/custom_bindings_util.cc index 0d350e3..08fb523 100644 --- a/chrome/renderer/extensions/custom_bindings_util.cc +++ b/chrome/renderer/extensions/custom_bindings_util.cc @@ -38,7 +38,7 @@ std::vector<v8::Extension*> GetAll(ExtensionDispatcher* extension_dispatcher) { "extensions/input.ime_custom_bindings.js", "extensions/omnibox_custom_bindings.js", "extensions/page_action_custom_bindings.js", - "extensions/experimental.storage_custom_bindings.js", + "extensions/storage_custom_bindings.js", "extensions/tts_engine_custom_bindings.js", "extensions/types_custom_bindings.js", "extensions/windows_custom_bindings.js", @@ -53,7 +53,7 @@ std::vector<v8::Extension*> GetAll(ExtensionDispatcher* extension_dispatcher) { IDR_INPUT_IME_CUSTOM_BINDINGS_JS, IDR_OMNIBOX_CUSTOM_BINDINGS_JS, IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS, - IDR_EXPERIMENTAL_STORAGE_CUSTOM_BINDINGS_JS, + IDR_STORAGE_CUSTOM_BINDINGS_JS, IDR_TTS_ENGINE_CUSTOM_BINDINGS_JS, IDR_TYPES_CUSTOM_BINDINGS_JS, IDR_WINDOWS_CUSTOM_BINDINGS_JS, diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd index 1f5b8b0..533ea8c 100644 --- a/chrome/renderer/renderer_resources.grd +++ b/chrome/renderer/renderer_resources.grd @@ -42,7 +42,7 @@ without changes to the corresponding grd file. fb9 --> <include name="IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS" file="resources\extensions\page_actions_custom_bindings.js" type="BINDATA" /> <include name="IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS" file="resources\extensions\page_action_custom_bindings.js" type="BINDATA" /> <include name="IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS" file="resources\extensions\page_capture_custom_bindings.js" type="BINDATA" /> - <include name="IDR_EXPERIMENTAL_STORAGE_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.storage_custom_bindings.js" type="BINDATA" /> + <include name="IDR_STORAGE_CUSTOM_BINDINGS_JS" file="resources\extensions\storage_custom_bindings.js" type="BINDATA" /> <include name="IDR_TABS_CUSTOM_BINDINGS_JS" file="resources\extensions\tabs_custom_bindings.js" type="BINDATA" /> <include name="IDR_TTS_CUSTOM_BINDINGS_JS" file="resources\extensions\tts_custom_bindings.js" type="BINDATA" /> <include name="IDR_TTS_ENGINE_CUSTOM_BINDINGS_JS" file="resources\extensions\tts_engine_custom_bindings.js" type="BINDATA" /> diff --git a/chrome/renderer/resources/extensions/experimental.storage_custom_bindings.js b/chrome/renderer/resources/extensions/storage_custom_bindings.js index 53a9097..1d358c2 100644 --- a/chrome/renderer/resources/extensions/experimental.storage_custom_bindings.js +++ b/chrome/renderer/resources/extensions/storage_custom_bindings.js @@ -32,7 +32,7 @@ chromeHidden.registerCustomType('StorageArea', function(typesAPI) { var schema = this.parameters[functionName]; chromeHidden.validate(arguments, schema); return sendRequest( - 'experimental.storage.' + functionName, + 'storage.' + functionName, [namespace].concat(Array.prototype.slice.call(arguments)), extendSchema(schema)); }; |