chrome/browser/ui/toolbar/wrench_menu_model.h - Issue 11817045: Move auth-error reporting code out of SyncGlobalError and into SigninGlobalError

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11817045: Move auth-error reporting code out of SyncGlobalError and into SigninGlobalError (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Disabled ExtensionActionContextMenuTest.BrowserAction 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/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/wrench_menu_model.h

diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.h b/chrome/browser/ui/toolbar/wrench_menu_model.h

index 110eb20e64d489b858c168809d2477118e6c592e..33992881fb36fbb57cc4ca10f7a3f3e43fc84702 100644

--- a/chrome/browser/ui/toolbar/wrench_menu_model.h

+++ b/chrome/browser/ui/toolbar/wrench_menu_model.h

@@ -16,6 +16,7 @@

class BookmarkSubMenuModel;

class Browser;

+class GlobalError;

class RecentTabsSubMenuModel;

class TabStripModel;

@@ -147,7 +148,11 @@ class WrenchMenuModel : public ui::SimpleMenuModel,

// |new_menu| should be set to true.

void CreateZoomMenu(bool new_menu);

- string16 GetSyncMenuLabel() const;

+ // 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;

// Models for the special menu items with buttons.

scoped_ptr<ui::ButtonMenuItemModel> edit_menu_item_model_;