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

Side by Side Diff: chrome/browser/ui/views/wrench_menu.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
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 CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_
6 #define CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_ 6 #define CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_
7 7
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 const content::NotificationDetails& details) OVERRIDE; 95 const content::NotificationDetails& details) OVERRIDE;
96 96
97 private: 97 private:
98 class CutCopyPasteView; 98 class CutCopyPasteView;
99 class RecentTabsMenuModelDelegate; 99 class RecentTabsMenuModelDelegate;
100 class ZoomView; 100 class ZoomView;
101 101
102 typedef std::pair<ui::MenuModel*,int> Entry; 102 typedef std::pair<ui::MenuModel*,int> Entry;
103 typedef std::map<int,Entry> IDToEntry; 103 typedef std::map<int,Entry> IDToEntry;
104 104
105 const ui::NativeTheme* GetNativeTheme() const;
106
105 // Populates |parent| with all the child menus in |model|. Recursively invokes 107 // Populates |parent| with all the child menus in |model|. Recursively invokes
106 // |PopulateMenu| for any submenu. |next_id| is incremented for every menu 108 // |PopulateMenu| for any submenu. |next_id| is incremented for every menu
107 // that is created. 109 // that is created.
108 void PopulateMenu(views::MenuItemView* parent, 110 void PopulateMenu(views::MenuItemView* parent,
109 ui::MenuModel* model, 111 ui::MenuModel* model,
110 int* next_id); 112 int* next_id);
111 113
112 // Adds a new menu to |parent| to represent the MenuModel/index pair passed 114 // Adds a new menu to |parent| to represent the MenuModel/index pair passed
113 // in. 115 // in.
114 // Fur button containing menu items a |height| override can be specified with 116 // Fur button containing menu items a |height| override can be specified with
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 content::NotificationRegistrar registrar_; 172 content::NotificationRegistrar registrar_;
171 173
172 const bool use_new_menu_; 174 const bool use_new_menu_;
173 175
174 const bool supports_new_separators_; 176 const bool supports_new_separators_;
175 177
176 DISALLOW_COPY_AND_ASSIGN(WrenchMenu); 178 DISALLOW_COPY_AND_ASSIGN(WrenchMenu);
177 }; 179 };
178 180
179 #endif // CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_ 181 #endif // CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc ('k') | chrome/browser/ui/views/wrench_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698