Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5097)

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: Fixed the include for MediaRouterDialogControllerImpl 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 efa2bb753e7170e26509b573f3a0a97e4c78b0f6..ab4a47db7ced7d38bb044270f82a8cd391c01855 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1478,8 +1478,8 @@
'browser/ui/views/toolbar/media_router_action_platform_delegate_views.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',
mark a. foltz 2015/07/22 21:16:39 These are only included on desktop platforms, corr
whywhat 2015/07/22 22:55:01 Yes. WebUI doesn't compile on Android.
+ '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',
@@ -3172,7 +3172,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',
],

Powered by Google App Engine
This is Rietveld 408576698