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

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

Issue 1819443002: MacViews: draw combobox arrow backgrounds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix linux build Created 4 years, 9 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
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/views/background.h"
9 #include "ui/views/controls/button/label_button.h" 10 #include "ui/views/controls/button/label_button.h"
10 #include "ui/views/controls/button/label_button_border.h" 11 #include "ui/views/controls/button/label_button_border.h"
11 #include "ui/views/controls/focusable_border.h" 12 #include "ui/views/controls/focusable_border.h"
12 #include "ui/views/controls/scrollbar/native_scroll_bar.h" 13 #include "ui/views/controls/scrollbar/native_scroll_bar.h"
13 14
14 namespace views { 15 namespace views {
15 16
16 #if !defined(OS_MACOSX) 17 #if !defined(OS_MACOSX)
18
17 // static 19 // static
18 scoped_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() { 20 scoped_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() {
19 return make_scoped_ptr(new FocusableBorder()); 21 return make_scoped_ptr(new FocusableBorder());
20 } 22 }
21 23
22 // static 24 // static
25 scoped_ptr<Background> PlatformStyle::CreateComboboxBackground() {
26 return nullptr;
27 }
28
29 // static
23 scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder( 30 scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder(
24 Button::ButtonStyle style) { 31 Button::ButtonStyle style) {
25 if (!ui::MaterialDesignController::IsModeMaterial() || 32 if (!ui::MaterialDesignController::IsModeMaterial() ||
26 style != Button::STYLE_TEXTBUTTON) { 33 style != Button::STYLE_TEXTBUTTON) {
27 return make_scoped_ptr(new LabelButtonAssetBorder(style)); 34 return make_scoped_ptr(new LabelButtonAssetBorder(style));
28 } 35 }
29 36
30 scoped_ptr<LabelButtonBorder> border(new views::LabelButtonBorder()); 37 scoped_ptr<LabelButtonBorder> border(new views::LabelButtonBorder());
31 border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle( 38 border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle(
32 Button::STYLE_TEXTBUTTON)); 39 Button::STYLE_TEXTBUTTON));
33 return border; 40 return border;
34 } 41 }
35 42
36 // static 43 // static
37 scoped_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) { 44 scoped_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
38 return make_scoped_ptr(new NativeScrollBar(is_horizontal)); 45 return make_scoped_ptr(new NativeScrollBar(is_horizontal));
39 } 46 }
40 #endif 47 #endif
41 48
42 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) 49 #if !defined(OS_LINUX) || defined(OS_CHROMEOS)
43 // static 50 // static
44 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( 51 scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
45 LabelButton* button) { 52 LabelButton* button) {
46 return button->CreateDefaultBorder(); 53 return button->CreateDefaultBorder();
47 } 54 }
48 #endif 55 #endif
49 56
50 } // namespace views 57 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698