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

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

Issue 553233002: Dynamically calculate the number of extension icons to show per row in overflow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 171
171 // Menu corresponding to IDC_BOOKMARKS_MENU. 172 // Menu corresponding to IDC_BOOKMARKS_MENU.
172 views::MenuItemView* bookmark_menu_; 173 views::MenuItemView* bookmark_menu_;
173 174
174 // Menu corresponding to IDC_FEEDBACK. 175 // Menu corresponding to IDC_FEEDBACK.
175 views::MenuItemView* feedback_menu_item_; 176 views::MenuItemView* feedback_menu_item_;
176 177
177 // Used for managing "Recent tabs" menu items. 178 // Used for managing "Recent tabs" menu items.
178 scoped_ptr<RecentTabsMenuModelDelegate> recent_tabs_menu_model_delegate_; 179 scoped_ptr<RecentTabsMenuModelDelegate> recent_tabs_menu_model_delegate_;
179 180
181 // The section of the menu for the overflowed extension icons.
182 scoped_ptr<ExtensionToolbarMenuView> extension_overflow_;
183
180 content::NotificationRegistrar registrar_; 184 content::NotificationRegistrar registrar_;
181 185
182 // The bit mask of RunFlags. 186 // The bit mask of RunFlags.
183 const int run_flags_; 187 const int run_flags_;
184 188
185 ObserverList<WrenchMenuObserver> observer_list_; 189 ObserverList<WrenchMenuObserver> observer_list_;
186 190
187 DISALLOW_COPY_AND_ASSIGN(WrenchMenu); 191 DISALLOW_COPY_AND_ASSIGN(WrenchMenu);
188 }; 192 };
189 193
190 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_ 194 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698