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

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

Issue 12483006: wrench_menu: use NativeTheme colors under aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix windows build Created 7 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
« no previous file with comments | « ui/native_theme/native_theme_gtk.cc ('k') | ui/views/controls/menu/menu_config_views.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.h" 9 #include "ui/gfx/font.h"
10 #include "ui/views/views_export.h" 10 #include "ui/views/views_export.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 // Radius of the rounded corners of the menu border. Must be >= 0. 131 // Radius of the rounded corners of the menu border. Must be >= 0.
132 int corner_radius; 132 int corner_radius;
133 133
134 private: 134 private:
135 // Configures a MenuConfig as appropriate for the current platform. 135 // Configures a MenuConfig as appropriate for the current platform.
136 void Init(const ui::NativeTheme* theme); 136 void Init(const ui::NativeTheme* theme);
137 137
138 // TODO: temporary until we standardize. 138 // TODO: temporary until we standardize.
139 #if defined(USE_AURA) 139 #if defined(USE_AURA)
140 void InitAura(); 140 void InitAura(const ui::NativeTheme* theme);
141 #endif 141 #endif
142 142
143 // Adjust some values for a new UI style. 143 // Adjust some values for a new UI style.
144 void AdjustForCommonTheme(); 144 void AdjustForCommonTheme();
145 }; 145 };
146 146
147 } // namespace views 147 } // namespace views
148 148
149 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ 149 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_gtk.cc ('k') | ui/views/controls/menu/menu_config_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698