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

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

Issue 8507026: Fix infinite spin in auth dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For review. Created 9 years, 1 month 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 | « no previous file | chrome/browser/sync/sync_setup_flow.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 // This method handles clicks on "sync error" UI, showing the appropriate 272 // This method handles clicks on "sync error" UI, showing the appropriate
273 // dialog for the error condition (relogin / enter passphrase). 273 // dialog for the error condition (relogin / enter passphrase).
274 virtual void ShowErrorUI(); 274 virtual void ShowErrorUI();
275 275
276 // Shows the configure screen of the Sync setup wizard. If |sync_everything| 276 // Shows the configure screen of the Sync setup wizard. If |sync_everything|
277 // is true, shows the corresponding page in the customize screen; otherwise, 277 // is true, shows the corresponding page in the customize screen; otherwise,
278 // displays the page that gives the user the ability to select which data 278 // displays the page that gives the user the ability to select which data
279 // types to sync. 279 // types to sync.
280 void ShowConfigure(bool sync_everything); 280 void ShowConfigure(bool sync_everything);
281 281
282 void ShowSyncSetup(const std::string& sub_page); 282 virtual void ShowSyncSetup(const std::string& sub_page);
283 void ShowSyncSetupWithWizard(SyncSetupWizard::State state); 283 void ShowSyncSetupWithWizard(SyncSetupWizard::State state);
284 284
285 // Pretty-printed strings for a given StatusSummary. 285 // Pretty-printed strings for a given StatusSummary.
286 static std::string BuildSyncStatusSummaryText( 286 static std::string BuildSyncStatusSummaryText(
287 const browser_sync::SyncBackendHost::StatusSummary& summary); 287 const browser_sync::SyncBackendHost::StatusSummary& summary);
288 288
289 // Returns true if the SyncBackendHost has told us it's ready to accept 289 // Returns true if the SyncBackendHost has told us it's ready to accept
290 // changes. 290 // changes.
291 // [REMARK] - it is safe to call this function only from the ui thread. 291 // [REMARK] - it is safe to call this function only from the ui thread.
292 // because the variable is not thread safe and should only be accessed from 292 // because the variable is not thread safe and should only be accessed from
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 FailedDatatypesHandler failed_datatypes_handler_; 715 FailedDatatypesHandler failed_datatypes_handler_;
716 716
717 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 717 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
718 }; 718 };
719 719
720 bool ShouldShowActionOnUI( 720 bool ShouldShowActionOnUI(
721 const browser_sync::SyncProtocolError& error); 721 const browser_sync::SyncProtocolError& error);
722 722
723 723
724 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 724 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/sync_setup_flow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698