Commit 455c1e88 authored by Greg Thompson's avatar Greg Thompson Committed by Commit Bot

Fix jumbo build break for Chrome-branded builds.

In Google Chrome builds, cast_toolbar_button.cc may be built in the same
unit as cast_dialog_sink_button.cc. The latter includes a Google
Chrome-only header that declares some vector icons in the
::media_router::vector_icons namespace. As a result, the icons used in
cast_toolbar_button.cc can't be found because the points of use are in
the ::media_router namespace. Fix this by explicitly looking in
::vector_icons for the desired icons. This has no change for non-jumbo
builds, and fixes the world for jumbo builds.

BUG=803406
R=ellyjones@chromium.org
CC=oscarj@opera.com

Change-Id: I6af8e2593b20e1b674e8045fc406f12b9664fcb4
Reviewed-on: https://chromium-review.googlesource.com/1195885
Commit-Queue: mark a. foltz <mfoltz@chromium.org>
Reviewed-by: default avatarmark a. foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587345}
parent 637748be
...@@ -21,13 +21,13 @@ namespace media_router { ...@@ -21,13 +21,13 @@ namespace media_router {
namespace { namespace {
SkColor GetIconColor(const gfx::VectorIcon* icon_id) { SkColor GetIconColor(const gfx::VectorIcon* icon_id) {
if (icon_id == &vector_icons::kMediaRouterIdleIcon) if (icon_id == &::vector_icons::kMediaRouterIdleIcon)
return gfx::kChromeIconGrey; return gfx::kChromeIconGrey;
else if (icon_id == &vector_icons::kMediaRouterActiveIcon) else if (icon_id == &::vector_icons::kMediaRouterActiveIcon)
return gfx::kGoogleBlue500; return gfx::kGoogleBlue500;
else if (icon_id == &vector_icons::kMediaRouterWarningIcon) else if (icon_id == &::vector_icons::kMediaRouterWarningIcon)
return gfx::kGoogleYellow700; return gfx::kGoogleYellow700;
else if (icon_id == &vector_icons::kMediaRouterErrorIcon) else if (icon_id == &::vector_icons::kMediaRouterErrorIcon)
return gfx::kGoogleRed700; return gfx::kGoogleRed700;
NOTREACHED(); NOTREACHED();
...@@ -88,16 +88,16 @@ const gfx::VectorIcon& CastToolbarButton::GetCurrentIcon() const { ...@@ -88,16 +88,16 @@ const gfx::VectorIcon& CastToolbarButton::GetCurrentIcon() const {
media_router::IssueInfo::Severity severity = current_issue_->severity; media_router::IssueInfo::Severity severity = current_issue_->severity;
switch (severity) { switch (severity) {
case media_router::IssueInfo::Severity::FATAL: case media_router::IssueInfo::Severity::FATAL:
return vector_icons::kMediaRouterErrorIcon; return ::vector_icons::kMediaRouterErrorIcon;
case media_router::IssueInfo::Severity::WARNING: case media_router::IssueInfo::Severity::WARNING:
return vector_icons::kMediaRouterWarningIcon; return ::vector_icons::kMediaRouterWarningIcon;
case media_router::IssueInfo::Severity::NOTIFICATION: case media_router::IssueInfo::Severity::NOTIFICATION:
// There is no icon specific to notification issues. // There is no icon specific to notification issues.
break; break;
} }
} }
return has_local_display_route_ ? vector_icons::kMediaRouterActiveIcon return has_local_display_route_ ? ::vector_icons::kMediaRouterActiveIcon
: vector_icons::kMediaRouterIdleIcon; : ::vector_icons::kMediaRouterIdleIcon;
} }
void CastToolbarButton::ShowIcon() { void CastToolbarButton::ShowIcon() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment