components/sync/android/model_type_helper.h - Issue 2156693002: [Sync] //components/sync internal changes [DO NOT SUBMIT]

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: components/sync/android/model_type_helper.h

Issue 2156693002: [Sync] //components/sync internal changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« components/sync/android/java/src/org/chromium/components/sync/notifier/InvalidationPreferences.java ('K') | « components/sync/android/javatests/src/org/chromium/components/sync/notifier/signin/AccountManagerHelperTest.java ('k') | components/sync/android/model_type_helper.cc » ('j') | components/sync/android/sync_jni_registrar.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync/android/model_type_helper.h

diff --git a/sync/android/model_type_helper.h b/components/sync/android/model_type_helper.h

similarity index 61%

copy from sync/android/model_type_helper.h

copy to components/sync/android/model_type_helper.h

index d389d08d1b3c767bf354ee7da29b4ebd391adbb2..4e27a527e4ace19127ca1398b73ae99849194403 100644

--- a/sync/android/model_type_helper.h

+++ b/components/sync/android/model_type_helper.h

@@ -2,15 +2,14 @@

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

// found in the LICENSE file.

-#ifndef SYNC_ANDROID_MODEL_TYPE_HELPER_H_

-#define SYNC_ANDROID_MODEL_TYPE_HELPER_H_

+#ifndef COMPONENTS_SYNC_ANDROID_MODEL_TYPE_HELPER_H_

+#define COMPONENTS_SYNC_ANDROID_MODEL_TYPE_HELPER_H_

#include <jni.h>

namespace syncer {

bool RegisterModelTypeHelperJni(JNIEnv* env);

Nicolas Zea 2016/07/18 19:57:31 keep the newline, and a // namespace syncer commen

maxbogue 2016/07/18 21:26:51 Yeah, looks like that was why. Done in the manual

}

-#endif // SYNC_ANDROID_MODEL_TYPE_HELPER_H_

+#endif // COMPONENTS_SYNC_ANDROID_MODEL_TYPE_HELPER_H_