chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 1228863005: [MediaRouter] The minimal change to make everything build on Android.

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_controller_factory.cc

Issue 1228863005: [MediaRouter] The minimal change to make everything build on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed test_support compile issue on ChromeOS Created 5 years, 5 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/media/router/media_router.h ('K') | « chrome/browser/ui/toolbar/media_router_action.cc ('k') | chrome/browser/ui/webui/media_router/media_router_dialog_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 343ec7ef3481b69dcfb3cdecb92755d77ce4dba2..ee83f9cb3afc1c77f53686132a017ef2dacf9dac 100644

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

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

@@ -88,7 +88,7 @@

#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"

#endif

-#if defined(ENABLE_MEDIA_ROUTER)

+#if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)

#include "chrome/browser/ui/webui/media_router/media_router_ui.h"

#endif

@@ -555,7 +555,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

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

return &NewWebUI<WebRtcLogsUI>;

#endif

-#if defined(ENABLE_MEDIA_ROUTER)

+#if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)

if (url.host() == chrome::kChromeUIMediaRouterHost &&

switches::MediaRouterEnabled()) {

return &NewWebUI<media_router::MediaRouterUI>;