Commit 51682ae0 authored by John Williams's avatar John Williams Committed by Commit Bot

Added correct "stop" icon for Media Router.

Bug: 877702
Change-Id: Ifdd3355c2d9d0fb46fed19c21cbe2a066abf6ad4
Reviewed-on: https://chromium-review.googlesource.com/c/1239010
Commit-Queue: John Williams <jrw@chromium.org>
Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Reviewed-by: default avatarTakumi Fujimoto <takumif@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596417}
parent 58181c25
...@@ -87,6 +87,7 @@ aggregate_vector_icons("chrome_vector_icons") { ...@@ -87,6 +87,7 @@ aggregate_vector_icons("chrome_vector_icons") {
"smartphone.icon", "smartphone.icon",
"speaker.icon", "speaker.icon",
"speaker_group.icon", "speaker_group.icon",
"stop.icon",
"supervisor_account.icon", "supervisor_account.icon",
"supervisor_account_circle.icon", "supervisor_account_circle.icon",
"sync.icon", "sync.icon",
......
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
CANVAS_DIMENSIONS, 20,
ROUND_RECT, 7, 7, 6, 6, 0,
NEW_PATH,
STROKE, 2,
CIRCLE, 10, 10, 7,
CLOSE
...@@ -38,9 +38,8 @@ class StopButton : public views::LabelButton { ...@@ -38,9 +38,8 @@ class StopButton : public views::LabelButton {
int button_tag, int button_tag,
bool enabled) bool enabled)
: views::LabelButton(button_listener, base::string16()) { : views::LabelButton(button_listener, base::string16()) {
// TODO(https://crbug.com/877702): Update the icon to match the mocks. static const gfx::ImageSkia icon =
static const gfx::ImageSkia icon = CreateVectorIcon( CreateVectorIcon(kStopIcon, kPrimaryIconSize, gfx::kGoogleBlue500);
kNavigateStopIcon, kPrimaryIconSize, gfx::kGoogleBlue500);
SetImage(views::Button::STATE_NORMAL, icon); SetImage(views::Button::STATE_NORMAL, icon);
SetInkDropMode(views::InkDropHostView::InkDropMode::ON); SetInkDropMode(views::InkDropHostView::InkDropMode::ON);
set_tag(button_tag); set_tag(button_tag);
......
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