chrome/browser/extensions/extension_service.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_service.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_mediaplayer_private_api.cc ('k') | chrome/browser/extensions/file_manager_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_service.cc

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

index 65bd8a56f03acf16edb0d0fe0b76251ca8bc0044..098869295c6251cfe38f31a50ed08b3554305b56 100644

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

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

@@ -84,6 +84,7 @@

#if defined(OS_CHROMEOS)

#include "chrome/browser/chromeos/extensions/file_browser_event_router.h"

+#include "chrome/browser/chromeos/extensions/media_player_event_router.h"

#include "webkit/fileapi/file_system_context.h"

#include "webkit/fileapi/file_system_mount_point_provider.h"

#include "webkit/fileapi/file_system_path_manager.h"

@@ -565,6 +566,7 @@ void ExtensionService::InitEventRouters() {

file_browser_event_router_.reset(

new ExtensionFileBrowserEventRouter(profile_));

file_browser_event_router_->ObserveFileSystemEvents();

+ ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);

#endif

#if defined(OS_CHROMEOS) && defined(TOUCH_UI)

« no previous file with comments | « chrome/browser/extensions/extension_mediaplayer_private_api.cc ('k') | chrome/browser/extensions/file_manager_util.h » ('j') | no next file with comments »