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

Unified Diff: chrome/browser/ui/toolbar/wrench_menu_model.h

Issue 11886079: Revert 177136 due to memory error on Mac ASAN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/sync_ui_util_unittest.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/wrench_menu_model.h
===================================================================
--- chrome/browser/ui/toolbar/wrench_menu_model.h (revision 177205)
+++ chrome/browser/ui/toolbar/wrench_menu_model.h (working copy)
@@ -16,7 +16,6 @@
class BookmarkSubMenuModel;
class Browser;
-class GlobalError;
class RecentTabsSubMenuModel;
class TabStripModel;
@@ -148,11 +147,7 @@
// |new_menu| should be set to true.
void CreateZoomMenu(bool new_menu);
- // Various GlobalError objects share a single menu item. This helper routine
- // returns the GlobalError object that is currently displaying a message in
- // that item, otherwise returns NULL if we should display one of the default
- // messages.
- GlobalError* GetActiveSignedInServiceError() const;
+ string16 GetSyncMenuLabel() const;
// Models for the special menu items with buttons.
scoped_ptr<ui::ButtonMenuItemModel> edit_menu_item_model_;
« no previous file with comments | « chrome/browser/sync/sync_ui_util_unittest.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