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

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

Issue 12077030: Allow signin to continue even if sync is disabled by policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows sync integration test failure 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
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 33992881fb36fbb57cc4ca10f7a3f3e43fc84702..21bbdc25e7ec345a597c6fa01d1c8dd8edbec891 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.h
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.h
@@ -16,7 +16,6 @@
class BookmarkSubMenuModel;
class Browser;
-class GlobalError;
class RecentTabsSubMenuModel;
class TabStripModel;
@@ -148,12 +147,6 @@ class WrenchMenuModel : public ui::SimpleMenuModel,
// |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;
-
// Models for the special menu items with buttons.
scoped_ptr<ui::ButtonMenuItemModel> edit_menu_item_model_;
scoped_ptr<ui::ButtonMenuItemModel> zoom_menu_item_model_;
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_helper_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