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

Unified Diff: chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc

Issue 1177973005: Correct ENABLE_MEDIA_ROUTER defines to fix compilation without it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit fix. Created 5 years, 6 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/component_extensions_whitelist/whitelist.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
index c96b7653f08003673fc5a42a0a7f8e43568ccc16..e9c1f0dfaf63d3de754b247a120a4a5d40e2f0e4 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
@@ -43,8 +43,10 @@ ComponentToolbarActionsFactory::GetComponentToolbarActions() {
// (since each will have an action in the toolbar or overflow menu), this
// should be okay. If this changes, we should rethink this design to have,
// e.g., RegisterChromeAction().
+#if defined(ENABLE_MEDIA_ROUTER)
if (media_router_ui_enabled_)
component_actions.push_back(new MediaRouterAction());
+#endif // defined(ENABLE_MEDIA_ROUTER)
return component_actions.Pass();
}
« no previous file with comments | « chrome/browser/extensions/component_extensions_whitelist/whitelist.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698