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

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

Issue 6364009: From the enter-passphrase screen in sync setup, canceling should only disable... (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 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 // 464 //
465 // TODO(akalin): Figure out a better way to do this. Ideally, we'd 465 // TODO(akalin): Figure out a better way to do this. Ideally, we'd
466 // construct the backend outside this class and pass it in to the 466 // construct the backend outside this class and pass it in to the
467 // contructor or Initialize(). 467 // contructor or Initialize().
468 virtual void CreateBackend(); 468 virtual void CreateBackend();
469 469
470 const browser_sync::DataTypeController::TypeMap& data_type_controllers() { 470 const browser_sync::DataTypeController::TypeMap& data_type_controllers() {
471 return data_type_controllers_; 471 return data_type_controllers_;
472 } 472 }
473 473
474 // Helper method for managing encryption UI.
475 bool IsEncryptedDatatypeEnabled() const;
476
474 // The wizard will try to read the auth state out of the profile sync 477 // The wizard will try to read the auth state out of the profile sync
475 // service using this member. Captcha and error state are reflected. 478 // service using this member. Captcha and error state are reflected.
476 GoogleServiceAuthError last_auth_error_; 479 GoogleServiceAuthError last_auth_error_;
477 480
478 // Our asynchronous backend to communicate with sync components living on 481 // Our asynchronous backend to communicate with sync components living on
479 // other threads. 482 // other threads.
480 scoped_ptr<browser_sync::SyncBackendHost> backend_; 483 scoped_ptr<browser_sync::SyncBackendHost> backend_;
481 484
482 // Cache of the last name the client attempted to authenticate. 485 // Cache of the last name the client attempted to authenticate.
483 std::string last_attempted_user_email_; 486 std::string last_attempted_user_email_;
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 // and is necessary because the nudge sync framework can drop nudges for 625 // and is necessary because the nudge sync framework can drop nudges for
623 // a wide variety of sync-related conditions (throttling, connections issues, 626 // a wide variety of sync-related conditions (throttling, connections issues,
624 // syncer paused, etc.). It can only be removed correctly when the framework 627 // syncer paused, etc.). It can only be removed correctly when the framework
625 // is reworked to allow one-shot commands like clearing server data. 628 // is reworked to allow one-shot commands like clearing server data.
626 base::OneShotTimer<ProfileSyncService> clear_server_data_timer_; 629 base::OneShotTimer<ProfileSyncService> clear_server_data_timer_;
627 630
628 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 631 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
629 }; 632 };
630 633
631 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 634 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698