chrome/chrome_browser_ui.gypi - 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/chrome_browser_ui.gypi

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: Moved MRDC::GetOrCreateForWebContents to its own .cc file 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

Index: chrome/chrome_browser_ui.gypi

diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi

index af37b83e30da48b065dc579b5f52f2be3e75bb2c..09c46ddd55e66ad775c1b96b1ec7d9a8f0db599f 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -1475,8 +1475,8 @@

'browser/ui/toolbar/media_router_action.h',

'browser/ui/webui/media_router/media_cast_mode.cc',

'browser/ui/webui/media_router/media_cast_mode.h',

- 'browser/ui/webui/media_router/media_router_dialog_controller.cc',

- 'browser/ui/webui/media_router/media_router_dialog_controller.h',

+ 'browser/ui/webui/media_router/media_router_dialog_controller_impl.cc',

+ 'browser/ui/webui/media_router/media_router_dialog_controller_impl.h',

'browser/ui/webui/media_router/media_router_localized_strings_provider.cc',

'browser/ui/webui/media_router/media_router_localized_strings_provider.h',

'browser/ui/webui/media_router/media_router_resources_provider.cc',

@@ -3169,7 +3169,7 @@

['enable_google_now==1 and OS!="android"', {

'sources': [ '<@(chrome_browser_ui_google_now_non_android_sources)' ],

}],

- ['enable_media_router==1', {

+ ['enable_media_router==1 and OS!="android" and OS!="ios"', {

'dependencies': [

'browser/media/router/media_router.gyp:media_router',

« chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc ('K') | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »