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

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

Issue 7193031: Move UI specific implementation from ProfileSyncService to SyncSetupFlowHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Upload after merge. Created 9 years, 5 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 | « no previous file | 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) 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 <string> 9 #include <string>
10 10
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 virtual void ShowErrorUI(); 255 virtual void ShowErrorUI();
256 256
257 // Shows the configure screen of the Sync setup wizard. If |sync_everything| 257 // Shows the configure screen of the Sync setup wizard. If |sync_everything|
258 // is true, shows the corresponding page in the customize screen; otherwise, 258 // is true, shows the corresponding page in the customize screen; otherwise,
259 // displays the page that gives the user the ability to select which data 259 // displays the page that gives the user the ability to select which data
260 // types to sync. 260 // types to sync.
261 void ShowConfigure(bool sync_everything); 261 void ShowConfigure(bool sync_everything);
262 262
263 void PromptForExistingPassphrase(); 263 void PromptForExistingPassphrase();
264 264
265 void ShowSyncSetup(SyncSetupWizard::State state);
266
267 // Pretty-printed strings for a given StatusSummary. 265 // Pretty-printed strings for a given StatusSummary.
268 static std::string BuildSyncStatusSummaryText( 266 static std::string BuildSyncStatusSummaryText(
269 const browser_sync::SyncBackendHost::StatusSummary& summary); 267 const browser_sync::SyncBackendHost::StatusSummary& summary);
270 268
271 // Returns true if the SyncBackendHost has told us it's ready to accept 269 // Returns true if the SyncBackendHost has told us it's ready to accept
272 // changes. 270 // changes.
273 // [REMARK] - it is safe to call this function only from the ui thread. 271 // [REMARK] - it is safe to call this function only from the ui thread.
274 // because the variable is not thread safe and should only be accessed from 272 // because the variable is not thread safe and should only be accessed from
275 // single thread. If we want multiple threads to access this(and there is 273 // single thread. If we want multiple threads to access this(and there is
276 // currently no need to do so) we need to protect this with a lock. 274 // currently no need to do so) we need to protect this with a lock.
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 // because we haven't finished initializing). Cleared when we successfully 637 // because we haven't finished initializing). Cleared when we successfully
640 // post a new encrypt task to the sync backend. 638 // post a new encrypt task to the sync backend.
641 syncable::ModelTypeSet pending_types_for_encryption_; 639 syncable::ModelTypeSet pending_types_for_encryption_;
642 640
643 scoped_ptr<browser_sync::BackendMigrator> migrator_; 641 scoped_ptr<browser_sync::BackendMigrator> migrator_;
644 642
645 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 643 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
646 }; 644 };
647 645
648 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 646 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698