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

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

Issue 9956097: suppress user/password dialog when re-enabling sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve Nicolas's comments. 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
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 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 // backend is because if we had encountered an unrecoverable error we don't 610 // backend is because if we had encountered an unrecoverable error we don't
611 // want to startup once more. 611 // want to startup once more.
612 virtual void ReconfigureDatatypeManager(); 612 virtual void ReconfigureDatatypeManager();
613 613
614 // Called when the user changes the sync configuration, to update the UMA 614 // Called when the user changes the sync configuration, to update the UMA
615 // stats. 615 // stats.
616 void UpdateSelectedTypesHistogram( 616 void UpdateSelectedTypesHistogram(
617 bool sync_everything, 617 bool sync_everything,
618 const syncable::ModelTypeSet chosen_types) const; 618 const syncable::ModelTypeSet chosen_types) const;
619 619
620 // Refresh spare sync bootstrap token for re-enabling the sync service.
621 // Called on successful sign-in notifications.
622 void RefreshSpareBootstrapToken(const std::string& passphrase);
Nicolas Zea 2012/04/03 23:47:20 condition on OS_CHROMEOS
kochi 2012/04/04 00:10:20 Done.
623
620 // Factory used to create various dependent objects. 624 // Factory used to create various dependent objects.
621 scoped_ptr<ProfileSyncComponentsFactory> factory_; 625 scoped_ptr<ProfileSyncComponentsFactory> factory_;
622 626
623 // The profile whose data we are synchronizing. 627 // The profile whose data we are synchronizing.
624 Profile* profile_; 628 Profile* profile_;
625 629
626 // The class that handles getting, setting, and persisting sync 630 // The class that handles getting, setting, and persisting sync
627 // preferences. 631 // preferences.
628 browser_sync::SyncPrefs sync_prefs_; 632 browser_sync::SyncPrefs sync_prefs_;
629 633
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 bool setup_in_progress_; 741 bool setup_in_progress_;
738 742
739 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 743 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
740 }; 744 };
741 745
742 bool ShouldShowActionOnUI( 746 bool ShouldShowActionOnUI(
743 const browser_sync::SyncProtocolError& error); 747 const browser_sync::SyncProtocolError& error);
744 748
745 749
746 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 750 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698