Commit d46559ee authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

kStopIcon is a constant in the OSX APIs so rename kGenericStopIcon

Jumbo Mac fyi builder broke when a kStopIcon was introduced in
https://chromium-review.googlesource.com/c/chromium/src/+/1239010
because the OSX API has a kStopIcon in
.../MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/Carbon.framework/Frameworks/HIToolbox.framework/Headers/Dialogs.h

This renames it to kGenericStopIcon to make the builds go again.

TBR=jrw@chromium.org,estade@chromium.org

Bug: 877702
Change-Id: Id6c675b539f8e3161ef322bf008174ec2911d4be
Reviewed-on: https://chromium-review.googlesource.com/c/1261042Reviewed-by: default avatarDaniel Bratell <bratell@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#596571}
parent 0b8e6276
...@@ -51,6 +51,7 @@ aggregate_vector_icons("chrome_vector_icons") { ...@@ -51,6 +51,7 @@ aggregate_vector_icons("chrome_vector_icons") {
"folder.icon", "folder.icon",
"folder_supervised.icon", "folder_supervised.icon",
"forward_arrow_touch.icon", "forward_arrow_touch.icon",
"generic_stop.icon",
"globe.icon", "globe.icon",
"google_pay_logo.icon", "google_pay_logo.icon",
"horizontal_menu.icon", "horizontal_menu.icon",
...@@ -87,7 +88,6 @@ aggregate_vector_icons("chrome_vector_icons") { ...@@ -87,7 +88,6 @@ 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",
......
...@@ -38,8 +38,8 @@ class StopButton : public views::LabelButton { ...@@ -38,8 +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()) {
static const gfx::ImageSkia icon = static const gfx::ImageSkia icon = CreateVectorIcon(
CreateVectorIcon(kStopIcon, kPrimaryIconSize, gfx::kGoogleBlue500); kGenericStopIcon, 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