components/sync_driver/glue/sync_backend_host_impl.cc - Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: components/sync_driver/glue/sync_backend_host_impl.cc

Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pss_strings

Patch Set: Created 5 years, 1 month 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

« no previous file with comments | « components/sync_driver/glue/sync_backend_host_impl.h ('k') | components/sync_driver/glue/sync_backend_host_mock.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 #include "chrome/browser/sync/glue/sync_backend_host_impl.h"	5 #include "components/sync_driver/glue/sync_backend_host_impl.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/location.h"	8 #include "base/location.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/single_thread_task_runner.h"	10 #include "base/single_thread_task_runner.h"

11 #include "chrome/browser/sync/glue/sync_backend_host_core.h"

12 #include "components/invalidation/public/invalidation_service.h"	11 #include "components/invalidation/public/invalidation_service.h"

13 #include "components/invalidation/public/object_id_invalidation_map.h"	12 #include "components/invalidation/public/object_id_invalidation_map.h"

14 #include "components/signin/core/browser/signin_client.h"	13 #include "components/signin/core/browser/signin_client.h"

	14 #include "components/sync_driver/glue/sync_backend_host_core.h"

15 #include "components/sync_driver/glue/sync_backend_registrar.h"	15 #include "components/sync_driver/glue/sync_backend_registrar.h"

16 #include "components/sync_driver/invalidation_helper.h"	16 #include "components/sync_driver/invalidation_helper.h"

17 #include "components/sync_driver/sync_client.h"	17 #include "components/sync_driver/sync_client.h"

18 #include "components/sync_driver/sync_driver_switches.h"	18 #include "components/sync_driver/sync_driver_switches.h"

19 #include "components/sync_driver/sync_frontend.h"	19 #include "components/sync_driver/sync_frontend.h"

20 #include "components/sync_driver/sync_prefs.h"	20 #include "components/sync_driver/sync_prefs.h"

21 #include "sync/internal_api/public/activation_context.h"	21 #include "sync/internal_api/public/activation_context.h"

22 #include "sync/internal_api/public/base_transaction.h"	22 #include "sync/internal_api/public/base_transaction.h"

23 #include "sync/internal_api/public/events/protocol_event.h"	23 #include "sync/internal_api/public/events/protocol_event.h"

24 #include "sync/internal_api/public/http_bridge.h"	24 #include "sync/internal_api/public/http_bridge.h"

(...skipping 831 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
856 const syncer::SyncManager::ClearServerDataCallback& frontend_callback) {	856 const syncer::SyncManager::ClearServerDataCallback& frontend_callback) {

857 DCHECK(ui_thread_->BelongsToCurrentThread());	857 DCHECK(ui_thread_->BelongsToCurrentThread());

858 frontend_callback.Run();	858 frontend_callback.Run();

859 }	859 }

860	860

861 } // namespace browser_sync	861 } // namespace browser_sync

862	862

863 #undef SDVLOG	863 #undef SDVLOG

864	864

865 #undef SLOG	865 #undef SLOG

OLD	NEW