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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/sync_global_error.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
« no previous file with comments | « chrome/browser/sync/sync_global_error.h ('k') | chrome/browser/sync/sync_global_error_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_global_error.cc
diff --git a/chrome/browser/sync/sync_global_error.cc b/chrome/browser/sync/sync_global_error.cc
index 57d33530769c1ed6f576822f64d96db31c406e89..8dab40d3ece188a75f7cad6cb752450691eb3f1a 100644
--- a/chrome/browser/sync/sync_global_error.cc
+++ b/chrome/browser/sync/sync_global_error.cc
@@ -18,8 +18,12 @@
typedef GoogleServiceAuthError AuthError;
-SyncGlobalError::SyncGlobalError(ProfileSyncService* service)
- : service_(service) {
+SyncGlobalError::SyncGlobalError(ProfileSyncService* service,
+ SigninManager* signin)
+ : service_(service),
+ signin_(signin) {
+ DCHECK(service_);
+ DCHECK(signin_);
OnStateChanged();
}
@@ -96,7 +100,7 @@ void SyncGlobalError::OnStateChanged() {
string16 bubble_message;
string16 bubble_accept_label;
sync_ui_util::GetStatusLabelsForSyncGlobalError(
- service_, &menu_label, &bubble_message, &bubble_accept_label);
+ service_, *signin_, &menu_label, &bubble_message, &bubble_accept_label);
// All the labels should be empty or all of them non-empty.
DCHECK((menu_label.empty() && bubble_message.empty() &&
« no previous file with comments | « chrome/browser/sync/sync_global_error.h ('k') | chrome/browser/sync/sync_global_error_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698