chrome/renderer/extensions/extension_dispatcher.cc - Issue 10224009: Experimental USB API

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 10224009: Experimental USB API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 8 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/extension_permission_set.cc ('K') | « chrome/renderer/extensions/experimental.usb_custom_bindings.cc ('k') | chrome/renderer/renderer_resources.grd » ('j') | no next file with comments »
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 c808efa567675920f1840610abb8a2367343fa1c..90e86b577425dd49be3613dbb36ed78fe59cab59 100644

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

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

@@ -24,6 +24,7 @@

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

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

#include "chrome/renderer/extensions/experimental.socket_custom_bindings.h"

+#include "chrome/renderer/extensions/experimental.usb_custom_bindings.h"

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

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

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

@@ -70,6 +71,7 @@ using content::RenderThread;

using extensions::ApiDefinitionsNatives;

using extensions::ContextMenusCustomBindings;

using extensions::ExperimentalSocketCustomBindings;

+using extensions::ExperimentalUsbCustomBindings;

using extensions::ExtensionAPI;

using extensions::ExtensionCustomBindings;

using extensions::Feature;

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

new ExtensionCustomBindings(this)));

module_system->RegisterNativeHandler("experimental_socket",

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

+ module_system->RegisterNativeHandler("experimental_usb",

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

module_system->RegisterNativeHandler("file_browser_handler",

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

module_system->RegisterNativeHandler("file_browser_private",

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

IDR_EXPERIMENTAL_RUNTIME_CUSTOM_BINDINGS_JS);

source_map_.RegisterSource("experimental.socket",

IDR_EXPERIMENTAL_SOCKET_CUSTOM_BINDINGS_JS);

+ source_map_.RegisterSource("experimental.usb",

+ IDR_EXPERIMENTAL_USB_CUSTOM_BINDINGS_JS);

source_map_.RegisterSource("experimental.webRequest",

IDR_EXPERIMENTAL_WEBREQUEST_CUSTOM_BINDINGS_JS);

source_map_.RegisterSource("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS);