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

Side by Side Diff: chrome/browser/ui/views/toolbar/wrench_menu.h

Issue 324393002: Extension Toolbar redesign, part 1 (overflow) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review comments Created 6 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TOOLBAR_WRENCH_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_
7 7
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/observer_list.h" 12 #include "base/observer_list.h"
13 #include "components/bookmarks/browser/base_bookmark_model_observer.h" 13 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
14 #include "content/public/browser/notification_observer.h" 14 #include "content/public/browser/notification_observer.h"
15 #include "content/public/browser/notification_registrar.h" 15 #include "content/public/browser/notification_registrar.h"
16 #include "ui/base/models/menu_model.h" 16 #include "ui/base/models/menu_model.h"
17 #include "ui/views/controls/menu/menu_delegate.h" 17 #include "ui/views/controls/menu/menu_delegate.h"
18 18
19 class BookmarkMenuDelegate; 19 class BookmarkMenuDelegate;
20 class Browser; 20 class Browser;
21 class ExtensionToolbarMenuView;
21 class WrenchMenuObserver; 22 class WrenchMenuObserver;
22 23
23 namespace ui { 24 namespace ui {
24 class NativeTheme; 25 class NativeTheme;
25 } 26 }
26 27
27 namespace views { 28 namespace views {
28 class MenuButton; 29 class MenuButton;
29 struct MenuConfig; 30 struct MenuConfig;
30 class MenuItemView; 31 class MenuItemView;
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 165
165 // Used for managing the bookmark menu items. 166 // Used for managing the bookmark menu items.
166 scoped_ptr<BookmarkMenuDelegate> bookmark_menu_delegate_; 167 scoped_ptr<BookmarkMenuDelegate> bookmark_menu_delegate_;
167 168
168 // Menu corresponding to IDC_BOOKMARKS_MENU. 169 // Menu corresponding to IDC_BOOKMARKS_MENU.
169 views::MenuItemView* bookmark_menu_; 170 views::MenuItemView* bookmark_menu_;
170 171
171 // Menu corresponding to IDC_FEEDBACK. 172 // Menu corresponding to IDC_FEEDBACK.
172 views::MenuItemView* feedback_menu_item_; 173 views::MenuItemView* feedback_menu_item_;
173 174
175 // Menu corresponding to IDC_EXTENSIONS_OVERFLOW_MENU.
176 scoped_ptr<ExtensionToolbarMenuView> extension_toolbar_menu_view_;
177
174 // Used for managing "Recent tabs" menu items. 178 // Used for managing "Recent tabs" menu items.
175 scoped_ptr<RecentTabsMenuModelDelegate> recent_tabs_menu_model_delegate_; 179 scoped_ptr<RecentTabsMenuModelDelegate> recent_tabs_menu_model_delegate_;
176 180
177 content::NotificationRegistrar registrar_; 181 content::NotificationRegistrar registrar_;
178 182
179 const bool use_new_menu_; 183 const bool use_new_menu_;
180 184
181 const bool supports_new_separators_; 185 const bool supports_new_separators_;
182 186
183 ObserverList<WrenchMenuObserver> observer_list_; 187 ObserverList<WrenchMenuObserver> observer_list_;
184 188
185 DISALLOW_COPY_AND_ASSIGN(WrenchMenu); 189 DISALLOW_COPY_AND_ASSIGN(WrenchMenu);
186 }; 190 };
187 191
188 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_ 192 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698