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

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

Issue 9959038: Removed ProfileSyncService::UIShouldDepictAuthInProgress (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged with ToT. Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 28b53c16466d0ef7f0c80b36396bf91ca341d886..9a3d51987c1ab3515148a7482a1c826aaa0e17d1 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -18,6 +18,8 @@
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/signin/signin_manager.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/sync/sync_global_error.h"
@@ -574,6 +576,8 @@ void WrenchMenuModel::UpdateZoomControls() {
}
string16 WrenchMenuModel::GetSyncMenuLabel() const {
- return sync_ui_util::GetSyncMenuLabel(ProfileSyncServiceFactory::
- GetInstance()->GetForProfile(browser_->profile()->GetOriginalProfile()));
+ Profile* profile = browser_->profile()->GetOriginalProfile();
+ return sync_ui_util::GetSyncMenuLabel(
+ ProfileSyncServiceFactory::GetForProfile(profile),
+ *SigninManagerFactory::GetForProfile(profile));
}
« no previous file with comments | « chrome/browser/sync/sync_ui_util_unittest.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698