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

Side by Side Diff: ui/views/style/platform_style.cc

Issue 1817613002: MacViews: draw Mac combobox arrows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove noop image_bounds Created 4 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 unified diff | Download patch
« no previous file with comments | « ui/views/style/platform_style.h ('k') | ui/views/style/platform_style_mac.mm » ('j') | 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 "build/build_config.h" 7 #include "build/build_config.h"
8 #include "ui/base/material_design/material_design_controller.h" 8 #include "ui/base/material_design/material_design_controller.h"
9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/resources/grit/ui_resources.h"
9 #include "ui/views/background.h" 11 #include "ui/views/background.h"
10 #include "ui/views/controls/button/label_button.h" 12 #include "ui/views/controls/button/label_button.h"
11 #include "ui/views/controls/button/label_button_border.h" 13 #include "ui/views/controls/button/label_button_border.h"
12 #include "ui/views/controls/focusable_border.h" 14 #include "ui/views/controls/focusable_border.h"
13 #include "ui/views/controls/scrollbar/native_scroll_bar.h" 15 #include "ui/views/controls/scrollbar/native_scroll_bar.h"
14 16
15 namespace views { 17 namespace views {
16 18
17 #if !defined(OS_MACOSX) 19 #if !defined(OS_MACOSX)
18 20
19 // static 21 // static
22 gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled,
23 Combobox::Style style) {
24 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
25 return *rb.GetImageSkiaNamed(IDR_MENU_DROPARROW);
26 }
27
28 // static
20 scoped_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() { 29 scoped_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() {
21 return make_scoped_ptr(new FocusableBorder()); 30 return make_scoped_ptr(new FocusableBorder());
22 } 31 }
23 32
24 // static 33 // static
25 scoped_ptr<Background> PlatformStyle::CreateComboboxBackground() { 34 scoped_ptr<Background> PlatformStyle::CreateComboboxBackground() {
26 return nullptr; 35 return nullptr;
27 } 36 }
28 37
29 // static 38 // static
(...skipping 18 matching lines...) Expand all
48 57
49 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) 58 #if !defined(OS_LINUX) || defined(OS_CHROMEOS)
50 // static 59 // static
51 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( 60 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
52 LabelButton* button) { 61 LabelButton* button) {
53 return button->CreateDefaultBorder(); 62 return button->CreateDefaultBorder();
54 } 63 }
55 #endif 64 #endif
56 65
57 } // namespace views 66 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/style/platform_style.h ('k') | ui/views/style/platform_style_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698