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

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

Issue 2391393002: Harmony - Use FocusableBorder for comboboxes on Mac (Closed)
Patch Set: more Created 4 years, 2 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 "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "ui/base/material_design/material_design_controller.h" 9 #include "ui/base/material_design/material_design_controller.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 51 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
52 return *rb.GetImageSkiaNamed(IDR_MENU_DROPARROW); 52 return *rb.GetImageSkiaNamed(IDR_MENU_DROPARROW);
53 } 53 }
54 54
55 // static 55 // static
56 std::unique_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() { 56 std::unique_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() {
57 return base::MakeUnique<FocusableBorder>(); 57 return base::MakeUnique<FocusableBorder>();
58 } 58 }
59 59
60 // static 60 // static
61 std::unique_ptr<Background> PlatformStyle::CreateComboboxBackground(
62 int shoulder_width) {
63 return nullptr;
64 }
65
66 // static
67 std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) { 61 std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
68 return base::MakeUnique<NativeScrollBar>(is_horizontal); 62 return base::MakeUnique<NativeScrollBar>(is_horizontal);
69 } 63 }
70 64
71 // static 65 // static
72 SkColor PlatformStyle::TextColorForButton( 66 SkColor PlatformStyle::TextColorForButton(
73 const ButtonColorByState& color_by_state, 67 const ButtonColorByState& color_by_state,
74 const LabelButton& button) { 68 const LabelButton& button) {
75 return color_by_state[button.state()]; 69 return color_by_state[button.state()];
76 } 70 }
(...skipping 20 matching lines...) Expand all
97 91
98 #if !defined(DESKTOP_LINUX) 92 #if !defined(DESKTOP_LINUX)
99 // static 93 // static
100 std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( 94 std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
101 LabelButton* button) { 95 LabelButton* button) {
102 return button->CreateDefaultBorder(); 96 return button->CreateDefaultBorder();
103 } 97 }
104 #endif 98 #endif
105 99
106 } // namespace views 100 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698