chrome/renderer/extensions/extension_dispatcher.cc - Issue 10808093: move openMediaGalleryManager fn out of experimental.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/renderer/extensions/extension_dispatcher.cc

Issue 10808093: move openMediaGalleryManager fn out of experimental. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 80 chars Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc ('K') | « chrome/common/extensions/docs/samples.json ('k') | chrome/renderer/renderer_resources.grd » ('j') | chrome/test/data/extensions/api_test/media_galleries/test.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/extensions/extension_dispatcher.cc

diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc

index be445227cd2011eb0097852fb871f62cd2d5500d..896946d0ec6ce3cb684230c9d7fd2af216fa3c61 100644

--- a/chrome/renderer/extensions/extension_dispatcher.cc

+++ b/chrome/renderer/extensions/extension_dispatcher.cc

@@ -563,8 +563,6 @@ void ExtensionDispatcher::RegisterNativeHandlers(ModuleSystem* module_system,

module_system->RegisterNativeHandler("extension",

scoped_ptr<NativeHandler>(

new ExtensionCustomBindings(this)));

- module_system->RegisterNativeHandler("experimental_mediaGalleries",

- scoped_ptr<NativeHandler>(new MediaGalleryCustomBindings()));

module_system->RegisterNativeHandler("experimental_app",

scoped_ptr<NativeHandler>(new ExperimentalAppCustomBindings()));

module_system->RegisterNativeHandler("experimental_usb",

@@ -575,6 +573,8 @@ void ExtensionDispatcher::RegisterNativeHandlers(ModuleSystem* module_system,

scoped_ptr<NativeHandler>(new FileBrowserPrivateCustomBindings()));

module_system->RegisterNativeHandler("i18n",

scoped_ptr<NativeHandler>(new I18NCustomBindings()));

+ module_system->RegisterNativeHandler("mediaGalleries",

+ scoped_ptr<NativeHandler>(new MediaGalleryCustomBindings()));

module_system->RegisterNativeHandler("page_actions",

scoped_ptr<NativeHandler>(

new PageActionsCustomBindings(this)));

@@ -625,7 +625,7 @@ void ExtensionDispatcher::PopulateSourceMap() {

source_map_.RegisterSource("experimental.bluetooth",

IDR_EXPERIMENTAL_BLUETOOTH_CUSTOM_BINDINGS_JS);

source_map_.RegisterSource("experimental.mediaGalleries",

- IDR_MEDIA_GALLERY_CUSTOM_BINDINGS_JS);

+ IDR_EXPERIMENTAL_MEDIA_GALLERY_CUSTOM_BINDINGS_JS);

source_map_.RegisterSource("experimental.offscreen",

IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS);

source_map_.RegisterSource("experimental.usb",

@@ -639,6 +639,8 @@ void ExtensionDispatcher::PopulateSourceMap() {

IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS);

source_map_.RegisterSource("i18n", IDR_I18N_CUSTOM_BINDINGS_JS);

source_map_.RegisterSource("input.ime", IDR_INPUT_IME_CUSTOM_BINDINGS_JS);

+ source_map_.RegisterSource("mediaGalleries",

+ IDR_MEDIA_GALLERY_CUSTOM_BINDINGS_JS);

source_map_.RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS);

source_map_.RegisterSource("pageActions",

IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS);