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

Unified Diff: ui/views/controls/menu/menu_controller.h

Issue 1454583002: Change Views menus to consistently use GetNativeTheme for theming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get menu config from item Created 5 years, 1 month 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/controls/menu/menu_config.cc ('k') | ui/views/controls/menu/menu_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_controller.h
diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h
index 0b5344d5d9ce6e0b5dccebdd66a37fad6911530f..2a26bf454f74c69fc598327af97f9a303d5978a6 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -30,7 +30,6 @@ namespace gfx {
class Screen;
}
namespace ui {
-class NativeTheme;
class OSExchangeData;
class ScopedEventDispatcher;
}
@@ -303,8 +302,7 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
// Creates a MenuController. If |blocking| is true a nested message loop is
// started in |Run|.
- MenuController(ui::NativeTheme* theme,
- bool blocking,
+ MenuController(bool blocking,
internal::MenuControllerDelegate* delegate);
~MenuController() override;
@@ -636,8 +634,6 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
// showing a context menu from a menu).
int message_loop_depth_;
- views::MenuConfig menu_config_;
-
// The timestamp of the event which closed the menu - or 0 otherwise.
base::TimeDelta closing_event_time_;
« no previous file with comments | « ui/views/controls/menu/menu_config.cc ('k') | ui/views/controls/menu/menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698