sync/internal_api/sync_manager.cc - Issue 10534080: sync: move internal_api components used by chrome/browser into internal_api/public

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: sync/internal_api/sync_manager.cc

Issue 10534080: sync: move internal_api components used by chrome/browser into internal_api/public (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 8 years, 6 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

Index: sync/internal_api/sync_manager.cc

diff --git a/sync/internal_api/sync_manager.cc b/sync/internal_api/sync_manager.cc

index 13b313e816dca452409c8e416215b9278f636505..e9d3434baee1baa8f437b1c3d177b480ee197467 100644

--- a/sync/internal_api/sync_manager.cc

+++ b/sync/internal_api/sync_manager.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "sync/internal_api/sync_manager.h"

+#include "sync/internal_api/public/sync_manager.h"

#include <string>

@@ -25,22 +25,23 @@

#include "sync/engine/sync_scheduler.h"

#include "sync/engine/syncer_types.h"

#include "sync/engine/throttled_data_type_tracker.h"

-#include "sync/internal_api/base_node.h"

#include "sync/internal_api/change_reorder_buffer.h"

-#include "sync/internal_api/configure_reason.h"

#include "sync/internal_api/debug_info_event_listener.h"

#include "sync/internal_api/js_mutation_event_observer.h"

#include "sync/internal_api/js_sync_manager_observer.h"

+#include "sync/internal_api/public/base_node.h"

+#include "sync/internal_api/public/configure_reason.h"

#include "sync/internal_api/public/engine/polling_constants.h"

+#include "sync/internal_api/public/read_node.h"

+#include "sync/internal_api/public/read_transaction.h"

#include "sync/internal_api/public/syncable/model_type.h"

#include "sync/internal_api/public/syncable/model_type_payload_map.h"

-#include "sync/internal_api/read_node.h"

-#include "sync/internal_api/read_transaction.h"

+#include "sync/internal_api/public/user_share.h"

+#include "sync/internal_api/public/util/experiments.h"

+#include "sync/internal_api/public/write_node.h"

+#include "sync/internal_api/public/write_transaction.h"

#include "sync/internal_api/syncapi_internal.h"

#include "sync/internal_api/syncapi_server_connection_manager.h"

-#include "sync/internal_api/user_share.h"

-#include "sync/internal_api/write_node.h"

-#include "sync/internal_api/write_transaction.h"

#include "sync/js/js_arg_list.h"

#include "sync/js/js_backend.h"

#include "sync/js/js_event_details.h"

@@ -54,7 +55,6 @@

#include "sync/syncable/directory_change_delegate.h"

#include "sync/syncable/syncable.h"

#include "sync/util/cryptographer.h"

-#include "sync/util/experiments.h"

#include "sync/util/get_session_name.h"

#include "sync/util/time.h"

« no previous file with comments | « sync/internal_api/sync_manager.h ('k') | sync/internal_api/syncapi_server_connection_manager.cc » ('j') | no next file with comments »