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

Unified Diff: ui/views/controls/combobox/combobox.cc

Issue 2391393002: Harmony - Use FocusableBorder for comboboxes on Mac (Closed)
Patch Set: fix mac 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/BUILD.gn ('k') | ui/views/style/mac/combobox_background_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/combobox/combobox.cc
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
index cc474726ba960ea528b48f698a89ba36e401370c..2c26c8fb313d7bbf6713667246dcc26e5741442b 100644
--- a/ui/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -409,12 +409,6 @@ Combobox::Combobox(ui::ComboboxModel* model, Style style)
#endif
UpdateBorder();
- if (UseMd()) {
- // set_background() takes ownership but takes a raw pointer.
- std::unique_ptr<Background> b =
- PlatformStyle::CreateComboboxBackground(GetArrowContainerWidth());
- set_background(b.release());
- }
// Initialize the button images.
Button::ButtonState button_states[] = {
@@ -767,8 +761,7 @@ void Combobox::ButtonPressed(Button* sender, const ui::Event& event) {
}
void Combobox::UpdateBorder() {
- std::unique_ptr<FocusableBorder> border(
- PlatformStyle::CreateComboboxBorder());
+ std::unique_ptr<FocusableBorder> border(new FocusableBorder());
if (style_ == STYLE_ACTION)
border->SetInsets(5, 10, 5, 10);
if (invalid_)
« no previous file with comments | « ui/views/BUILD.gn ('k') | ui/views/style/mac/combobox_background_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698