chrome/browser/sync/profile_sync_service.h - Issue 1354883003: Componentize chrome/browser/sync/backup_rollback_controller

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/profile_sync_service.h

Issue 1354883003: Componentize chrome/browser/sync/backup_rollback_controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: namespace change browser_sync -> sync_driver Created 5 years, 3 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/backup_rollback_controller_unittest.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | components/sync_driver/backup_rollback_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service.h

diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h

index e46164c3b38b4176e9df861a4f23fbcd4c1d9c7d..0decad33563c1a5ed35508f0bbcfaebb787f127c 100644

--- a/chrome/browser/sync/profile_sync_service.h

+++ b/chrome/browser/sync/profile_sync_service.h

@@ -22,12 +22,12 @@

#include "base/time/time.h"

#include "base/timer/timer.h"

#include "chrome/browser/browsing_data/browsing_data_remover.h"

-#include "chrome/browser/sync/backup_rollback_controller.h"

#include "chrome/browser/sync/glue/sync_backend_host.h"

#include "chrome/browser/sync/sessions/sessions_sync_manager.h"

#include "chrome/browser/sync/startup_controller.h"

#include "components/keyed_service/core/keyed_service.h"

#include "components/signin/core/browser/signin_manager_base.h"

+#include "components/sync_driver/backup_rollback_controller.h"

#include "components/sync_driver/data_type_controller.h"

#include "components/sync_driver/data_type_manager.h"

#include "components/sync_driver/data_type_manager_observer.h"

@@ -946,8 +946,7 @@ class ProfileSyncService : public sync_driver::SyncService,

scoped_ptr<browser_sync::StartupController> startup_controller_;

- scoped_ptr<browser_sync::BackupRollbackController>

- backup_rollback_controller_;

+ scoped_ptr<sync_driver::BackupRollbackController> backup_rollback_controller_;

// Mode of current backend.

BackendMode backend_mode_;