summaryrefslogtreecommitdiffstats
path: root/base/android
diff options
context:
space:
mode:
authorbnc <bnc@chromium.org>2015-03-09 13:47:44 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-09 20:48:48 +0000
commit2220bd6553b4aae764ed66b24f5aa6e398c70b68 (patch)
tree42a41c557a79bf89067e9db4ede1a77d270e1cf8 /base/android
parent79f7a57302cae3f7afcd53c6dff542e32bada999 (diff)
downloadchromium_src-2220bd6553b4aae764ed66b24f5aa6e398c70b68.zip
chromium_src-2220bd6553b4aae764ed66b24f5aa6e398c70b68.tar.gz
chromium_src-2220bd6553b4aae764ed66b24f5aa6e398c70b68.tar.bz2
Revert of base: Fix/add header #ifndef guards. (patchset #2 id:20001 of https://codereview.chromium.org/985003004/)
Reason for revert: This seems to be causing tree closing compile failure https://build.chromium.org/p/chromium/builders/Android/builds/36135/steps/compile/logs/stdio. Original issue's description: > base: Fix/add header #ifndef guards. > > Header guards should be defined based on the path and file name of the > header file. Some headers have it wrong, some are missing the guards, > and some just have the matching comment wrong. > > R=Nico > BUG=464816 > > Committed: https://crrev.com/301b392761fd8f66f3a701ab1dd011c6e7a55e19 > Cr-Commit-Position: refs/heads/master@{#319722} TBR=thakis@chromium.org,danakj@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=464816 Review URL: https://codereview.chromium.org/989343002 Cr-Commit-Position: refs/heads/master@{#319728}
Diffstat (limited to 'base/android')
-rw-r--r--base/android/important_file_writer_android.h6
-rw-r--r--base/android/java_handler_thread.h6
-rw-r--r--base/android/jni_generator/golden_sample_for_tests_jni.h6
-rw-r--r--base/android/jni_generator/sample_for_tests.h5
-rw-r--r--base/android/library_loader/library_load_from_apk_status_codes.h6
-rw-r--r--base/android/library_loader/library_loader_hooks.h6
-rw-r--r--base/android/trace_event_binding.h6
7 files changed, 18 insertions, 23 deletions
diff --git a/base/android/important_file_writer_android.h b/base/android/important_file_writer_android.h
index 88e4441..20956ba 100644
--- a/base/android/important_file_writer_android.h
+++ b/base/android/important_file_writer_android.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_ANDROID_IMPORTANT_FILE_WRITER_ANDROID_H_
-#define BASE_ANDROID_IMPORTANT_FILE_WRITER_ANDROID_H_
+#ifndef NATIVE_FRAMEWORK_CHROME_IMPORTANT_FILE_WRITE_ANDROID_H_
+#define NATIVE_FRAMEWORK_CHROME_IMPORTANT_FILE_WRITE_ANDROID_H_
#include <jni.h>
@@ -15,4 +15,4 @@ bool RegisterImportantFileWriterAndroid(JNIEnv* env);
} // namespace android
} // namespace base
-#endif // BASE_ANDROID_IMPORTANT_FILE_WRITER_ANDROID_H_
+#endif // NATIVE_FRAMEWORK_CHROME_IMPORTANT_FILE_WRITE_ANDROID_H_
diff --git a/base/android/java_handler_thread.h b/base/android/java_handler_thread.h
index c9a2c02..7cd274d 100644
--- a/base/android/java_handler_thread.h
+++ b/base/android/java_handler_thread.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_ANDROID_JAVA_HANDLER_THREAD_H_
-#define BASE_ANDROID_JAVA_HANDLER_THREAD_H_
+#ifndef BASE_THREADING_JAVA_THREAD_H_
+#define BASE_THREADING_JAVA_THREAD_H_
#include <jni.h>
@@ -46,4 +46,4 @@ class BASE_EXPORT JavaHandlerThread {
} // namespace android
} // namespace base
-#endif // BASE_ANDROID_JAVA_HANDLER_THREAD_H_
+#endif // BASE_THREADING_JAVA_THREAD_H_
diff --git a/base/android/jni_generator/golden_sample_for_tests_jni.h b/base/android/jni_generator/golden_sample_for_tests_jni.h
index 42ec0fb..ba7494e 100644
--- a/base/android/jni_generator/golden_sample_for_tests_jni.h
+++ b/base/android/jni_generator/golden_sample_for_tests_jni.h
@@ -7,8 +7,8 @@
// For
// org/chromium/example/jni_generator/SampleForTests
-#ifndef BASE_ANDROID_JNI_GENERATOR_GOLDEN_SAMPLE_FOR_TESTS_JNI_H_
-#define BASE_ANDROID_JNI_GENERATOR_GOLDEN_SAMPLE_FOR_TESTS_JNI_H_
+#ifndef org_chromium_example_jni_generator_SampleForTests_JNI
+#define org_chromium_example_jni_generator_SampleForTests_JNI
#include <jni.h>
@@ -397,4 +397,4 @@ static bool RegisterNativesImpl(JNIEnv* env) {
} // namespace android
} // namespace base
-#endif // BASE_ANDROID_JNI_GENERATOR_GOLDEN_SAMPLE_FOR_TESTS_JNI_H_
+#endif // org_chromium_example_jni_generator_SampleForTests_JNI
diff --git a/base/android/jni_generator/sample_for_tests.h b/base/android/jni_generator/sample_for_tests.h
index c98cf97..4d76408 100644
--- a/base/android/jni_generator/sample_for_tests.h
+++ b/base/android/jni_generator/sample_for_tests.h
@@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_ANDROID_JNI_GENERATOR_SAMPLE_FOR_TESTS_H_
-#define BASE_ANDROID_JNI_GENERATOR_SAMPLE_FOR_TESTS_H_
-
#include <jni.h>
#include <map>
#include <string>
@@ -51,5 +48,3 @@ class CPPClass {
} // namespace android
} // namespace base
-
-#endif // BASE_ANDROID_JNI_GENERATOR_SAMPLE_FOR_TESTS_H_
diff --git a/base/android/library_loader/library_load_from_apk_status_codes.h b/base/android/library_loader/library_load_from_apk_status_codes.h
index 9591d3f..f99eebc 100644
--- a/base/android/library_loader/library_load_from_apk_status_codes.h
+++ b/base/android/library_loader/library_load_from_apk_status_codes.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_
-#define BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_
+#ifndef BASE_ANDROID_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_
+#define BASE_ANDROID_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_
namespace base {
namespace android {
@@ -43,4 +43,4 @@ enum LibraryLoadFromApkStatusCodes {
} // namespace android
} // namespace base
-#endif // BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_
+#endif // BASE_ANDROID_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_
diff --git a/base/android/library_loader/library_loader_hooks.h b/base/android/library_loader/library_loader_hooks.h
index b1624a0..7e8d527 100644
--- a/base/android/library_loader/library_loader_hooks.h
+++ b/base/android/library_loader/library_loader_hooks.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOADER_HOOKS_H_
-#define BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOADER_HOOKS_H_
+#ifndef BASE_ANDROID_LIBRARY_LOADER_HOOKS_H_
+#define BASE_ANDROID_LIBRARY_LOADER_HOOKS_H_
#include <jni.h>
@@ -67,4 +67,4 @@ BASE_EXPORT LibraryProcessType GetLibraryProcessType(JNIEnv* env);
} // namespace android
} // namespace base
-#endif // BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOADER_HOOKS_H_
+#endif // BASE_ANDROID_LIBRARY_LOADER_HOOKS_H_
diff --git a/base/android/trace_event_binding.h b/base/android/trace_event_binding.h
index 1c1a60b..ed06266 100644
--- a/base/android/trace_event_binding.h
+++ b/base/android/trace_event_binding.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_ANDROID_TRACE_EVENT_BINDING_H_
-#define BASE_ANDROID_TRACE_EVENT_BINDING_H_
+#ifndef BASE_ANDROID_TRACE_EVENT_H_
+#define BASE_ANDROID_TRACE_EVENT_H_
#include <jni.h>
@@ -15,4 +15,4 @@ extern bool RegisterTraceEvent(JNIEnv* env);
} // namespace android
} // namespace base
-#endif // BASE_ANDROID_TRACE_EVENT_BINDING_H_
+#endif // CONTENT_COMMON_ANDROID_TRACE_EVENT_H_