chrome/browser/ui/webui/chrome_web_ui_factory.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/ui/webui/chrome_web_ui_factory.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: Fixed style errors and localized strings. 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

« chrome/browser/extensions/extension_mediaplayer_private_api.cc ('K') | « chrome/browser/ui/browser_init.cc ('k') | chrome/browser/ui/webui/mediaplayer_ui.h » ('j') | chrome/browser/ui/webui/mediaplayer_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chrome_web_ui_factory.cc

diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_factory.cc

index 71931fa327f22e02321d9aedf49a32bbfd5f4943..abd83713786660efd5563a38c54da16850481086 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc

@@ -46,7 +46,6 @@

#include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h"

#include "chrome/browser/ui/webui/chromeos/system_info_ui.h"

#include "chrome/browser/ui/webui/active_downloads_ui.h"

-#include "chrome/browser/ui/webui/mediaplayer_ui.h"

#endif

#if defined(TOUCH_UI)

@@ -181,8 +180,6 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,

return &NewWebUI<ImageBurnUI>;

if (url.host() == chrome::kChromeUIKeyboardOverlayHost)

return &NewWebUI<KeyboardOverlayUI>;

- if (url.host() == chrome::kChromeUIMediaplayerHost)

- return &NewWebUI<MediaplayerUI>;

if (url.host() == chrome::kChromeUIMobileSetupHost)

return &NewWebUI<MobileSetupUI>;

if (url.host() == chrome::kChromeUIProxySettingsHost)