diff options
| author | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 21:17:00 +0000 |
|---|---|---|
| committer | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 21:17:00 +0000 |
| commit | bb0a6a0af3be6d24a5c8f9ebd2e686347a5c882d (patch) | |
| tree | 8232bb6244024f924040bef3d807f244054448bc /chrome/renderer | |
| parent | 1de623f2d7413081fe196d943ebae18b0a1b0ec4 (diff) | |
| download | chromium_src-bb0a6a0af3be6d24a5c8f9ebd2e686347a5c882d.zip chromium_src-bb0a6a0af3be6d24a5c8f9ebd2e686347a5c882d.tar.gz chromium_src-bb0a6a0af3be6d24a5c8f9ebd2e686347a5c882d.tar.bz2 | |
Move history API out of experimental. Allow extensions to override history page.
BUG=32362
TEST=ExtensionApiTest.History, ExtensionApiTest.Overrides, manual testing.
Review URL: http://codereview.chromium.org/1530002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/resources/extension_process_bindings.js | 17 | ||||
| -rw-r--r-- | chrome/renderer/resources/renderer_extension_bindings.js | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js index fe8499c..0879e91 100644 --- a/chrome/renderer/resources/extension_process_bindings.js +++ b/chrome/renderer/resources/extension_process_bindings.js @@ -619,21 +619,4 @@ var chrome = chrome || {}; if (!chrome.experimental.accessibility) chrome.experimental.accessibility = {}; - - if (!chrome.experimental.history) - chrome.experimental.history = {}; - - chrome.experimental.history.transitionType = { - LINK: 0, - TYPED: 1, - AUTO_BOOKMARK: 2, - AUTO_SUBFRAME: 3, - MANUAL_SUBFRAME: 4, - GENERATED: 5, - START_PAGE: 6, - FORM_SUBMIT: 7, - RELOAD: 8, - KEYWORD: 9, - KEYWORD_GENERATED: 10 - }; })(); diff --git a/chrome/renderer/resources/renderer_extension_bindings.js b/chrome/renderer/resources/renderer_extension_bindings.js index 5138e93..92fe2e3 100644 --- a/chrome/renderer/resources/renderer_extension_bindings.js +++ b/chrome/renderer/resources/renderer_extension_bindings.js @@ -250,11 +250,11 @@ var chrome = chrome || {}; "experimental.contextMenu", "experimental.extension", "experimental.idle", - "experimental.history", "experimental.infobars", "experimental.metrics", "experimental.popup", "experimental.processes", + "history", "pageAction", "pageActions", "tabs", |