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

Side by Side Diff: chrome/browser/ui/toolbar/wrench_menu_model.h

Issue 1241063003: Support Component Actions in the toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes per mfoltz@'s comments. Created 5 years, 4 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_TOOLBAR_WRENCH_MENU_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
6 #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ 6 #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
7 7
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 // Adds actionable global error menu items to the menu. 187 // Adds actionable global error menu items to the menu.
188 // Examples: Extension permissions and sign in errors. 188 // Examples: Extension permissions and sign in errors.
189 // Returns a boolean indicating whether any menu items were added. 189 // Returns a boolean indicating whether any menu items were added.
190 bool AddGlobalErrorMenuItems(); 190 bool AddGlobalErrorMenuItems();
191 191
192 // Appends everything needed for the clipboard menu: a menu break, the 192 // Appends everything needed for the clipboard menu: a menu break, the
193 // clipboard menu content and the finalizing menu break. 193 // clipboard menu content and the finalizing menu break.
194 void CreateCutCopyPasteMenu(); 194 void CreateCutCopyPasteMenu();
195 195
196 // Add a menu item for the extension icons. 196 // Add a menu item for the browser action icons.
197 void CreateExtensionToolbarOverflowMenu(); 197 void CreateActionToolbarOverflowMenu();
198 198
199 // Appends everything needed for the zoom menu: a menu break, then the zoom 199 // Appends everything needed for the zoom menu: a menu break, then the zoom
200 // menu content and then another menu break. 200 // menu content and then another menu break.
201 void CreateZoomMenu(); 201 void CreateZoomMenu();
202 202
203 void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change); 203 void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change);
204 204
205 bool ShouldShowNewIncognitoWindowMenuItem(); 205 bool ShouldShowNewIncognitoWindowMenuItem();
206 206
207 // Called when a command is selected. 207 // Called when a command is selected.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 Browser* browser_; // weak 247 Browser* browser_; // weak
248 TabStripModel* tab_strip_model_; // weak 248 TabStripModel* tab_strip_model_; // weak
249 249
250 scoped_ptr<content::HostZoomMap::Subscription> browser_zoom_subscription_; 250 scoped_ptr<content::HostZoomMap::Subscription> browser_zoom_subscription_;
251 content::NotificationRegistrar registrar_; 251 content::NotificationRegistrar registrar_;
252 252
253 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel); 253 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel);
254 }; 254 };
255 255
256 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ 256 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698