chrome/browser/sync/glue/bookmark_model_associator.cc - Issue 7587009: sync: add DEPS files to subdirs

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/glue/bookmark_model_associator.cc

Issue 7587009: sync: add DEPS files to subdirs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix include Created 9 years, 4 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:

Index: chrome/browser/sync/glue/bookmark_model_associator.cc

diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc

index 6e0ba5cd7a0f6d42983326a2c316d7daa7fe5dd8..a23e5171d7efce1d7280d8cfaca1d38ecc1515b8 100644

--- a/chrome/browser/sync/glue/bookmark_model_associator.cc

+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc

@@ -15,9 +15,9 @@

#include "chrome/browser/bookmarks/bookmark_model.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sync/api/sync_error.h"

+#include "chrome/browser/sync/engine/nigori_util.h"

#include "chrome/browser/sync/engine/syncapi.h"

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

-#include "chrome/browser/sync/syncable/nigori_util.h"

#include "chrome/browser/sync/util/cryptographer.h"

#include "chrome/common/chrome_switches.h"

#include "content/browser/browser_thread.h"