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

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

Issue 1007993004: Restructure the wrench menu into an action based order (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits Created 5 years, 8 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 private: 184 private:
185 class HelpMenuModel; 185 class HelpMenuModel;
186 // Testing constructor used for mocking. 186 // Testing constructor used for mocking.
187 friend class ::MockWrenchMenuModel; 187 friend class ::MockWrenchMenuModel;
188 188
189 WrenchMenuModel(); 189 WrenchMenuModel();
190 190
191 void Build(); 191 void Build();
192 192
193 void AddGlobalErrorMenuItems(); 193 // Adds actionable global error menu items to the menu.
194 // Examples: Extension permissions and sign in errors.
195 // Returns a boolean indicating whether any menu items were added.
196 bool AddGlobalErrorMenuItems();
194 197
195 // Appends everything needed for the clipboard menu: a menu break, the 198 // Appends everything needed for the clipboard menu: a menu break, the
196 // clipboard menu content and the finalizing menu break. 199 // clipboard menu content and the finalizing menu break.
197 void CreateCutCopyPasteMenu(); 200 void CreateCutCopyPasteMenu();
198 201
199 // Add a menu item for the extension icons. 202 // Add a menu item for the extension icons.
200 void CreateExtensionToolbarOverflowMenu(); 203 void CreateExtensionToolbarOverflowMenu();
201 204
202 // Appends everything needed for the zoom menu: a menu break, then the zoom 205 // Appends everything needed for the zoom menu: a menu break, then the zoom
203 // menu content and then another menu break. 206 // menu content and then another menu break.
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 Browser* browser_; // weak 253 Browser* browser_; // weak
251 TabStripModel* tab_strip_model_; // weak 254 TabStripModel* tab_strip_model_; // weak
252 255
253 scoped_ptr<content::HostZoomMap::Subscription> browser_zoom_subscription_; 256 scoped_ptr<content::HostZoomMap::Subscription> browser_zoom_subscription_;
254 content::NotificationRegistrar registrar_; 257 content::NotificationRegistrar registrar_;
255 258
256 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel); 259 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel);
257 }; 260 };
258 261
259 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ 262 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698