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

Side by Side Diff: ui/views/controls/menu/menu_config.h

Issue 1310903004: Use a ui::MenuModel in views::Combobox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +curlies Created 5 years, 3 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
« no previous file with comments | « ui/views/controls/combobox/combobox_unittest.cc ('k') | ui/views/controls/menu/menu_config.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_MENU_MENU_CONFIG_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
7 7
8 #include "third_party/skia/include/core/SkColor.h" 8 #include "third_party/skia/include/core/SkColor.h"
9 #include "ui/gfx/font_list.h" 9 #include "ui/gfx/font_list.h"
10 #include "ui/views/views_export.h" 10 #include "ui/views/views_export.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 106
107 // True if the context menu's should be offset from the cursor position. 107 // True if the context menu's should be offset from the cursor position.
108 bool offset_context_menus; 108 bool offset_context_menus;
109 109
110 // True if the scroll container should add a border stroke around the menu. 110 // True if the scroll container should add a border stroke around the menu.
111 bool use_outer_border; 111 bool use_outer_border;
112 112
113 // True if the icon is part of the label rather than in its own column. 113 // True if the icon is part of the label rather than in its own column.
114 bool icons_in_label; 114 bool icons_in_label;
115 115
116 // True if a combobox menu should put a checkmark next to the selected item.
117 bool check_selected_combobox_item;
118
116 const ui::NativeTheme* native_theme; 119 const ui::NativeTheme* native_theme;
117 120
118 // Delay, in ms, between when menus are selected or moused over and the menu 121 // Delay, in ms, between when menus are selected or moused over and the menu
119 // appears. 122 // appears.
120 int show_delay; 123 int show_delay;
121 124
122 // Radius of the rounded corners of the menu border. Must be >= 0. 125 // Radius of the rounded corners of the menu border. Must be >= 0.
123 int corner_radius; 126 int corner_radius;
124 127
125 private: 128 private:
126 // Configures a MenuConfig as appropriate for the current platform. 129 // Configures a MenuConfig as appropriate for the current platform.
127 void Init(const ui::NativeTheme* theme); 130 void Init(const ui::NativeTheme* theme);
128 131
129 // TODO: temporary until we standardize. 132 // TODO: temporary until we standardize.
130 void InitAura(const ui::NativeTheme* theme); 133 void InitAura(const ui::NativeTheme* theme);
131 }; 134 };
132 135
133 } // namespace views 136 } // namespace views
134 137
135 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ 138 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
OLDNEW
« no previous file with comments | « ui/views/controls/combobox/combobox_unittest.cc ('k') | ui/views/controls/menu/menu_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698