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

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

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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/signin/signin_manager.h ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <list> 9 #include <list>
10 #include <string> 10 #include <string>
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 // takes place, and the backend isn't initialized yet? 289 // takes place, and the backend isn't initialized yet?
290 virtual bool sync_initialized() const; 290 virtual bool sync_initialized() const;
291 virtual bool unrecoverable_error_detected() const; 291 virtual bool unrecoverable_error_detected() const;
292 const std::string& unrecoverable_error_message() { 292 const std::string& unrecoverable_error_message() {
293 return unrecoverable_error_message_; 293 return unrecoverable_error_message_;
294 } 294 }
295 tracked_objects::Location unrecoverable_error_location() { 295 tracked_objects::Location unrecoverable_error_location() {
296 return unrecoverable_error_location_; 296 return unrecoverable_error_location_;
297 } 297 }
298 298
299 // Reports whether the user is currently authenticating or not. This is used
300 // by the sync_ui_util helper routines to allow the UI to properly display
301 // an "authenticating..." status message instead of an auth error when we are
302 // in the process of trying to update credentials.
303 // TODO(atwilson): This state now resides in SigninManager - this method
304 // will be removed once we've cleaned up the callers. http://crbug.com/95269.
305 virtual bool UIShouldDepictAuthInProgress() const;
306
307 // Returns true if OnPassphraseRequired has been called for any reason. 299 // Returns true if OnPassphraseRequired has been called for any reason.
308 virtual bool IsPassphraseRequired() const; 300 virtual bool IsPassphraseRequired() const;
309 301
310 // Returns true if OnPassphraseRequired has been called for decryption and 302 // Returns true if OnPassphraseRequired has been called for decryption and
311 // we have an encrypted data type enabled. 303 // we have an encrypted data type enabled.
312 virtual bool IsPassphraseRequiredForDecryption() const; 304 virtual bool IsPassphraseRequiredForDecryption() const;
313 305
314 sync_api::PassphraseRequiredReason passphrase_required_reason() const { 306 sync_api::PassphraseRequiredReason passphrase_required_reason() const {
315 return passphrase_required_reason_; 307 return passphrase_required_reason_;
316 } 308 }
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 bool setup_in_progress_; 743 bool setup_in_progress_;
752 744
753 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 745 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
754 }; 746 };
755 747
756 bool ShouldShowActionOnUI( 748 bool ShouldShowActionOnUI(
757 const browser_sync::SyncProtocolError& error); 749 const browser_sync::SyncProtocolError& error);
758 750
759 751
760 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 752 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/signin/signin_manager.h ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698