chrome/browser/extensions/extension_function_dispatcher.cc - Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change.

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/browser/extensions/extension_function_dispatcher.cc

Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Resolved conflicts. Created 9 years, 7 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

« no previous file with comments | « chrome/browser/extensions/extension_file_browser_private_api.cc ('k') | chrome/browser/extensions/extension_mediaplayer_private_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_function_dispatcher.cc

diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc

index a19b839f780bd4ead51840c2b803b18f07944a6e..a012faa7bef51949443e95512ccc50f550cc9f8c 100644

--- a/chrome/browser/extensions/extension_function_dispatcher.cc

+++ b/chrome/browser/extensions/extension_function_dispatcher.cc

@@ -67,6 +67,7 @@

#if defined(OS_CHROMEOS)

#include "chrome/browser/extensions/extension_file_browser_private_api.h"

#include "chrome/browser/extensions/extension_info_private_api_chromeos.h"

+#include "chrome/browser/extensions/extension_mediaplayer_private_api.h"

#endif

// FactoryRegistry -------------------------------------------------------------

@@ -335,6 +336,12 @@ void FactoryRegistry::ResetFunctions() {

RegisterFunction<SelectFilesFunction>();

RegisterFunction<ViewFilesFunction>();

+ // Mediaplayer

+ RegisterFunction<PlayAtMediaplayerFunction>();

+ RegisterFunction<SetPlaybackErrorMediaplayerFunction>();

+ RegisterFunction<GetPlaylistMediaplayerFunction>();

+ RegisterFunction<TogglePlaylistPanelMediaplayerFunction>();

+ RegisterFunction<ToggleFullscreenMediaplayerFunction>();

#if defined(TOUCH_UI)

// Input

RegisterFunction<SendHandwritingStrokeFunction>();