chrome/browser/sync/glue/app_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/app_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/app_model_associator.cc

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

index a0a566dec81800bc6b574fa0b4182f5bce8a5060..50b109c71ce425c4ab396ecdedfa254a4abd6007 100644

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

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

@@ -8,12 +8,12 @@

#include "base/tracked.h"

#include "chrome/browser/extensions/extension_sync_data.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/extension_sync_traits.h"

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

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

#include "chrome/browser/sync/protocol/extension_specifics.pb.h"

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

#include "content/browser/browser_thread.h"

namespace browser_sync {