| Index: chrome/renderer/extensions/dispatcher.cc
|
| diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
|
| index 7e4d3104817f1c9d652fee33e56fe477c4ed30b7..a99c15935473a4c5b865a7f98a3995dc21a5c227 100644
|
| --- a/chrome/renderer/extensions/dispatcher.cc
|
| +++ b/chrome/renderer/extensions/dispatcher.cc
|
| @@ -34,7 +34,7 @@
|
| #include "chrome/renderer/extensions/file_browser_private_custom_bindings.h"
|
| #include "chrome/renderer/extensions/file_system_natives.h"
|
| #include "chrome/renderer/extensions/i18n_custom_bindings.h"
|
| -#include "chrome/renderer/extensions/media_gallery_custom_bindings.h"
|
| +#include "chrome/renderer/extensions/media_galleries_custom_bindings.h"
|
| #include "chrome/renderer/extensions/miscellaneous_bindings.h"
|
| #include "chrome/renderer/extensions/module_system.h"
|
| #include "chrome/renderer/extensions/native_handler.h"
|
| @@ -575,8 +575,6 @@ void Dispatcher::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_usb",
|
| scoped_ptr<NativeHandler>(new ExperimentalUsbCustomBindings()));
|
| module_system->RegisterNativeHandler("file_browser_handler",
|
| @@ -585,6 +583,8 @@ void Dispatcher::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 MediaGalleriesCustomBindings()));
|
| module_system->RegisterNativeHandler("page_actions",
|
| scoped_ptr<NativeHandler>(
|
| new PageActionsCustomBindings(this)));
|
| @@ -633,8 +633,9 @@ void Dispatcher::PopulateSourceMap() {
|
| source_map_.RegisterSource("devtools", IDR_DEVTOOLS_CUSTOM_BINDINGS_JS);
|
| source_map_.RegisterSource("experimental.bluetooth",
|
| IDR_EXPERIMENTAL_BLUETOOTH_CUSTOM_BINDINGS_JS);
|
| - source_map_.RegisterSource("experimental.mediaGalleries",
|
| - IDR_EXPERIMENTAL_MEDIA_GALLERY_CUSTOM_BINDINGS_JS);
|
| + source_map_.RegisterSource(
|
| + "experimental.mediaGalleries",
|
| + IDR_EXPERIMENTAL_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS);
|
| source_map_.RegisterSource("experimental.offscreen",
|
| IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS);
|
| source_map_.RegisterSource("experimental.usb",
|
| @@ -648,6 +649,8 @@ void Dispatcher::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_GALLERIES_CUSTOM_BINDINGS_JS);
|
| source_map_.RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS);
|
| source_map_.RegisterSource("pageActions",
|
| IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS);
|
|
|