chrome/renderer/extensions/extension_dispatcher.cc - Issue 9358076: Initial extension bindings for Media Gallery API.

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

Issue 9358076: Initial extension bindings for Media Gallery API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 9 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/common/extensions/api/experimental.mediaGalleries.json ('K') | « chrome/common/extensions/docs/js/api_page_generator.js ('k') | chrome/renderer/extensions/media_gallery_custom_bindings.h » ('j') | chrome/test/data/extensions/api_test/media_gallery/manifest.json » ('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 4d187bb295513a57c5802683623c61e561d873eb..56afd76191d7bc29cecc96dc762b5b7efa217d77 100644

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

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

@@ -48,6 +48,7 @@

#include "chrome/renderer/extensions/file_browser_handler_custom_bindings.h"

#include "chrome/renderer/extensions/file_browser_private_custom_bindings.h"

#include "chrome/renderer/extensions/i18n_custom_bindings.h"

+#include "chrome/renderer/extensions/media_gallery_custom_bindings.h"

#include "chrome/renderer/extensions/page_actions_custom_bindings.h"

#include "chrome/renderer/extensions/page_capture_custom_bindings.h"

#include "chrome/renderer/extensions/tabs_custom_bindings.h"

@@ -63,6 +64,7 @@ using extensions::FileBrowserHandlerCustomBindings;

using extensions::FileBrowserPrivateCustomBindings;

using extensions::I18NCustomBindings;

using extensions::MiscellaneousBindings;

+using extensions::MediaGalleryCustomBindings;

using extensions::PageActionsCustomBindings;

using extensions::PageCaptureCustomBindings;

using extensions::SchemaGeneratedBindings;

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

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

module_system->RegisterNativeHandler("i18n",

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

+ module_system->RegisterNativeHandler("experimental_mediaGalleries",

vandebo (ex-Chrome) 2012/03/21 16:17:57 Alphabetization fixed here too.

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

module_system->RegisterNativeHandler("page_actions",

scoped_ptr<NativeHandler>(

new PageActionsCustomBindings(this)));

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

IDR_FILE_BROWSER_PRIVATE_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("experimental.mediaGalleries",

+ IDR_MEDIA_GALLERY_CUSTOM_BINDINGS_JS);

jstritar 2012/03/21 00:02:02 I think the rest of these are ordered alphabetical

vandebo (ex-Chrome) 2012/03/21 16:17:57 Oops, fixed. The first argument was introduced re

source_map_.RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS);

source_map_.RegisterSource("pageActions",

IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS);