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

Side by Side Diff: ui/views/style/platform_style_mac.mm

Issue 2286323004: Remove vector_icons.gypi (Closed)
Patch Set: Missing includes Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « ui/gfx/vector_icons_sources.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/style/platform_style.h" 5 #include "ui/views/style/platform_style.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "ui/base/resource/resource_bundle.h" 8 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/gfx/color_utils.h" 9 #include "ui/gfx/color_utils.h"
10 #include "ui/gfx/paint_vector_icon.h" 10 #include "ui/gfx/paint_vector_icon.h"
11 #include "ui/gfx/vector_icons.h" 11 #include "ui/gfx/vector_icons_public.h"
12 #include "ui/resources/grit/ui_resources.h" 12 #include "ui/resources/grit/ui_resources.h"
13 #include "ui/views/controls/button/label_button.h" 13 #include "ui/views/controls/button/label_button.h"
14 #include "ui/views/controls/button/label_button_border.h" 14 #include "ui/views/controls/button/label_button_border.h"
15 #include "ui/views/controls/focusable_rounded_border_mac.h" 15 #include "ui/views/controls/focusable_rounded_border_mac.h"
16 #import "ui/views/controls/scrollbar/cocoa_scroll_bar.h" 16 #import "ui/views/controls/scrollbar/cocoa_scroll_bar.h"
17 #include "ui/views/style/mac/combobox_background_mac.h" 17 #include "ui/views/style/mac/combobox_background_mac.h"
18 #include "ui/views/style/mac/dialog_button_border_mac.h" 18 #include "ui/views/style/mac/dialog_button_border_mac.h"
19 19
20 namespace views { 20 namespace views {
21 21
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 SkColor PlatformStyle::BackgroundColorForMdButton( 100 SkColor PlatformStyle::BackgroundColorForMdButton(
101 SkColor color, 101 SkColor color,
102 Button::ButtonState state) { 102 Button::ButtonState state) {
103 // Per Harmony specs: Pressed state on Mac is + #000 at 0.05 alpha. 103 // Per Harmony specs: Pressed state on Mac is + #000 at 0.05 alpha.
104 if (state == Button::STATE_PRESSED) 104 if (state == Button::STATE_PRESSED)
105 return color_utils::AlphaBlend(SK_ColorBLACK, color, 0x08); 105 return color_utils::AlphaBlend(SK_ColorBLACK, color, 0x08);
106 return color; 106 return color;
107 } 107 }
108 108
109 } // namespace views 109 } // namespace views
OLDNEW
« no previous file with comments | « ui/gfx/vector_icons_sources.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698