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

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

Issue 393943006: MacViews: Remove GetMenu() from MenuRunner. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test compile Created 6 years, 5 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 | Annotate | Revision Log
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 <string> 8 #include <string>
9 9
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 182
183 // The accessible name of this combobox. 183 // The accessible name of this combobox.
184 base::string16 accessible_name_; 184 base::string16 accessible_name_;
185 185
186 // A helper used to select entries by keyboard input. 186 // A helper used to select entries by keyboard input.
187 scoped_ptr<PrefixSelector> selector_; 187 scoped_ptr<PrefixSelector> selector_;
188 188
189 // Responsible for showing the context menu. 189 // Responsible for showing the context menu.
190 scoped_ptr<MenuRunner> dropdown_list_menu_runner_; 190 scoped_ptr<MenuRunner> dropdown_list_menu_runner_;
191 191
192 // Weak. Owned by dropdown_list_menu_runner_.
193 MenuItemView* menu_;
194
192 // Is the drop down list showing 195 // Is the drop down list showing
193 bool dropdown_open_; 196 bool dropdown_open_;
194 197
195 // Like MenuButton, we use a time object in order to keep track of when the 198 // Like MenuButton, we use a time object in order to keep track of when the
196 // combobox was closed. The time is used for simulating menu behavior; that 199 // combobox was closed. The time is used for simulating menu behavior; that
197 // is, if the menu is shown and the button is pressed, we need to close the 200 // is, if the menu is shown and the button is pressed, we need to close the
198 // menu. There is no clean way to get the second click event because the 201 // menu. There is no clean way to get the second click event because the
199 // menu is displayed using a modal loop and, unlike regular menus in Windows, 202 // menu is displayed using a modal loop and, unlike regular menus in Windows,
200 // the button is not part of the displayed menu. 203 // the button is not part of the displayed menu.
201 base::Time closed_time_; 204 base::Time closed_time_;
(...skipping 19 matching lines...) Expand all
221 224
222 // Used for making calbacks. 225 // Used for making calbacks.
223 base::WeakPtrFactory<Combobox> weak_ptr_factory_; 226 base::WeakPtrFactory<Combobox> weak_ptr_factory_;
224 227
225 DISALLOW_COPY_AND_ASSIGN(Combobox); 228 DISALLOW_COPY_AND_ASSIGN(Combobox);
226 }; 229 };
227 230
228 } // namespace views 231 } // namespace views
229 232
230 #endif // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ 233 #endif // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/browser_action_view.cc ('k') | ui/views/controls/combobox/combobox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698