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

Unified Diff: ui/views/style/platform_style_mac.mm

Issue 2826313006: views: remove PlatformStyle combobox hooks (Closed)
Patch Set: remove BUILD lines for deleted icons Created 3 years, 8 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 | « ui/views/style/platform_style.cc ('k') | ui/views/vector_icons/combobox_arrow_mac_disabled.icon » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/style/platform_style_mac.mm
diff --git a/ui/views/style/platform_style_mac.mm b/ui/views/style/platform_style_mac.mm
index 7ee138050538a8c9420f9104f6a3d5fa80c6014f..e18282bc17fa80bd5b0ad02664542f7c221d4aaf 100644
--- a/ui/views/style/platform_style_mac.mm
+++ b/ui/views/style/platform_style_mac.mm
@@ -5,20 +5,15 @@
#include "ui/views/style/platform_style.h"
#include "base/memory/ptr_util.h"
-#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_features.h"
#include "ui/gfx/color_utils.h"
-#include "ui/gfx/paint_vector_icon.h"
-#include "ui/resources/grit/ui_resources.h"
#include "ui/views/controls/button/label_button.h"
#import "ui/views/controls/scrollbar/cocoa_scroll_bar.h"
-#include "ui/views/vector_icons.h"
#import <Cocoa/Cocoa.h>
namespace views {
-const int PlatformStyle::kComboboxNormalArrowPadding = 0;
const int PlatformStyle::kMinLabelButtonWidth = 32;
const int PlatformStyle::kMinLabelButtonHeight = 30;
const bool PlatformStyle::kDefaultLabelButtonHasBoldFont = false;
@@ -46,21 +41,6 @@ const CustomButton::KeyClickAction PlatformStyle::kKeyClickActionOnSpace =
const bool PlatformStyle::kReturnClicksFocusedControl = false;
// static
-gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled,
- Combobox::Style style) {
- // TODO(ellyjones): IDR_MENU_DROPARROW is a cross-platform image that doesn't
- // look right on Mac. See https://crbug.com/384071.
- if (style == Combobox::STYLE_ACTION) {
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- return *rb.GetImageSkiaNamed(IDR_MENU_DROPARROW);
- }
- const int kComboboxArrowWidth = 24;
- return gfx::CreateVectorIcon(
- is_enabled ? kComboboxArrowMacEnabledIcon : kComboboxArrowMacDisabledIcon,
- kComboboxArrowWidth, SK_ColorBLACK);
-}
-
-// static
std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
return base::MakeUnique<CocoaScrollBar>(is_horizontal);
}
« no previous file with comments | « ui/views/style/platform_style.cc ('k') | ui/views/vector_icons/combobox_arrow_mac_disabled.icon » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698