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

Side by Side Diff: ui/views/controls/combobox/combobox.h

Issue 1819443002: MacViews: draw combobox arrow backgrounds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use Background instead of a separate Part 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ 5 #ifndef UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
6 #define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ 6 #define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 // Overridden from PrefixDelegate: 100 // Overridden from PrefixDelegate:
101 int GetRowCount() override; 101 int GetRowCount() override;
102 int GetSelectedRow() override; 102 int GetSelectedRow() override;
103 void SetSelectedRow(int row) override; 103 void SetSelectedRow(int row) override;
104 base::string16 GetTextForRow(int row) override; 104 base::string16 GetTextForRow(int row) override;
105 105
106 // Overriden from ButtonListener: 106 // Overriden from ButtonListener:
107 void ButtonPressed(Button* sender, const ui::Event& event) override; 107 void ButtonPressed(Button* sender, const ui::Event& event) override;
108 108
109 int GetArrowButtonWidth() const;
tapted 2016/03/22 23:04:32 nit: move up before overrides also comment - some
Elly Fong-Jones 2016/03/23 18:07:44 Done.
110
109 private: 111 private:
110 friend class test::ComboboxTestApi; 112 friend class test::ComboboxTestApi;
111 113
112 class ComboboxMenuModelAdapter; 114 class ComboboxMenuModelAdapter;
113 115
114 // Updates the border according to the current state. 116 // Updates the border according to the current state.
115 void UpdateBorder(); 117 void UpdateBorder();
116 118
117 // Given bounds within our View, this helper mirrors the bounds if necessary. 119 // Given bounds within our View, this helper mirrors the bounds if necessary.
118 void AdjustBoundsForRTLUI(gfx::Rect* rect) const; 120 void AdjustBoundsForRTLUI(gfx::Rect* rect) const;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 203
202 // Used for making calbacks. 204 // Used for making calbacks.
203 base::WeakPtrFactory<Combobox> weak_ptr_factory_; 205 base::WeakPtrFactory<Combobox> weak_ptr_factory_;
204 206
205 DISALLOW_COPY_AND_ASSIGN(Combobox); 207 DISALLOW_COPY_AND_ASSIGN(Combobox);
206 }; 208 };
207 209
208 } // namespace views 210 } // namespace views
209 211
210 #endif // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ 212 #endif // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698