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

Side by Side Diff: chrome/browser/sync/profile_sync_service.h

Issue 6293010: Change all the places where the multi-purpose sync error link is surfaced to ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 // re-authentication, and returns true if it actually opened the dialog. 218 // re-authentication, and returns true if it actually opened the dialog.
219 // Returns false if a dialog is already showing, an auth attempt is in 219 // Returns false if a dialog is already showing, an auth attempt is in
220 // progress, the sync system is already authenticated, or some error 220 // progress, the sync system is already authenticated, or some error
221 // occurred preventing the action. We make it the duty of ProfileSyncService 221 // occurred preventing the action. We make it the duty of ProfileSyncService
222 // to open the dialog to easily ensure only one is ever showing. 222 // to open the dialog to easily ensure only one is ever showing.
223 virtual bool SetupInProgress() const; 223 virtual bool SetupInProgress() const;
224 bool WizardIsVisible() const { 224 bool WizardIsVisible() const {
225 return wizard_.IsVisible(); 225 return wizard_.IsVisible();
226 } 226 }
227 virtual void ShowLoginDialog(gfx::NativeWindow parent_window); 227 virtual void ShowLoginDialog(gfx::NativeWindow parent_window);
228
229 // This method handles clicks on "sync error" UI, showing the appropriate
230 // dialog for the error condition (relogin / enter passphrase).
231 virtual void ShowErrorUI(gfx::NativeWindow parent_window);
232
228 void ShowConfigure(gfx::NativeWindow parent_window); 233 void ShowConfigure(gfx::NativeWindow parent_window);
229 void PromptForExistingPassphrase(gfx::NativeWindow parent_window); 234 void PromptForExistingPassphrase(gfx::NativeWindow parent_window);
230 void SigninForPassphrase(TabContents* container); 235 void SigninForPassphrase(TabContents* container);
231 void ShowPassphraseMigration(gfx::NativeWindow parent_window); 236 void ShowPassphraseMigration(gfx::NativeWindow parent_window);
232 237
233 // Pretty-printed strings for a given StatusSummary. 238 // Pretty-printed strings for a given StatusSummary.
234 static std::string BuildSyncStatusSummaryText( 239 static std::string BuildSyncStatusSummaryText(
235 const browser_sync::SyncBackendHost::StatusSummary& summary); 240 const browser_sync::SyncBackendHost::StatusSummary& summary);
236 241
237 // Returns true if the SyncBackendHost has told us it's ready to accept 242 // Returns true if the SyncBackendHost has told us it's ready to accept
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 // and is necessary because the nudge sync framework can drop nudges for 574 // and is necessary because the nudge sync framework can drop nudges for
570 // a wide variety of sync-related conditions (throttling, connections issues, 575 // a wide variety of sync-related conditions (throttling, connections issues,
571 // syncer paused, etc.). It can only be removed correctly when the framework 576 // syncer paused, etc.). It can only be removed correctly when the framework
572 // is reworked to allow one-shot commands like clearing server data. 577 // is reworked to allow one-shot commands like clearing server data.
573 base::OneShotTimer<ProfileSyncService> clear_server_data_timer_; 578 base::OneShotTimer<ProfileSyncService> clear_server_data_timer_;
574 579
575 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 580 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
576 }; 581 };
577 582
578 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 583 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698