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

Unified Diff: chrome/browser/sync/startup_controller.cc

Issue 195873020: [Sync] Move SyncPrefs into sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rerererebase Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/startup_controller.h ('k') | chrome/browser/sync/startup_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/startup_controller.cc
diff --git a/chrome/browser/sync/startup_controller.cc b/chrome/browser/sync/startup_controller.cc
index 88928d77f5ae218e4bb3a294989a6cc397be7f3e..3f84735a2c49c23cc9d33d7265219c7d2b69168e 100644
--- a/chrome/browser/sync/startup_controller.cc
+++ b/chrome/browser/sync/startup_controller.cc
@@ -9,9 +9,9 @@
#include "base/metrics/histogram.h"
#include "base/strings/string_number_conversions.h"
#include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h"
-#include "chrome/browser/sync/sync_prefs.h"
#include "chrome/common/chrome_switches.h"
#include "components/signin/core/profile_oauth2_token_service.h"
+#include "components/sync_driver/sync_prefs.h"
namespace browser_sync {
@@ -37,7 +37,7 @@ enum DeferredInitTrigger {
StartupController::StartupController(
ProfileSyncServiceStartBehavior start_behavior,
const ProfileOAuth2TokenService* token_service,
- const browser_sync::SyncPrefs* sync_prefs,
+ const sync_driver::SyncPrefs* sync_prefs,
const ManagedUserSigninManagerWrapper* signin,
base::Closure start_backend)
: received_start_request_(false),
@@ -47,8 +47,8 @@ StartupController::StartupController(
token_service_(token_service),
signin_(signin),
start_backend_(start_backend),
- fallback_timeout_(base::TimeDelta::FromSeconds(
- kDeferredInitFallbackSeconds)),
+ fallback_timeout_(
+ base::TimeDelta::FromSeconds(kDeferredInitFallbackSeconds)),
weak_factory_(this) {
if (CommandLine::ForCurrentProcess()->HasSwitch(
« no previous file with comments | « chrome/browser/sync/startup_controller.h ('k') | chrome/browser/sync/startup_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698