| Index: base/android/command_line.h
|
| diff --git a/content/common/android/command_line.h b/base/android/command_line.h
|
| similarity index 50%
|
| rename from content/common/android/command_line.h
|
| rename to base/android/command_line.h
|
| index 3fe5efb31232a1aed02aa5351031eca5e35cdd20..7dd3c9021b039d2f4a8e9c724bc29f5cfe102387 100644
|
| --- a/content/common/android/command_line.h
|
| +++ b/base/android/command_line.h
|
| @@ -2,16 +2,25 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_COMMON_ANDROID_COMMAND_LINE_H_
|
| -#define CONTENT_COMMON_ANDROID_COMMAND_LINE_H_
|
| +#ifndef BASE_ANDROID_COMMAND_LINE_H_
|
| +#define BASE_ANDROID_COMMAND_LINE_H_
|
|
|
| #include <jni.h>
|
|
|
| +#include "base/base_export.h"
|
| +
|
| +namespace base {
|
| +namespace android {
|
| +
|
| // Appends all strings in the given array as flags to the Chrome command line.
|
| -void InitNativeCommandLineFromJavaArray(JNIEnv* env,
|
| - jobjectArray init_command_line);
|
| +void BASE_EXPORT InitNativeCommandLineFromJavaArray(
|
| + JNIEnv* env,
|
| + jobjectArray init_command_line);
|
|
|
| // JNI registration boilerplate.
|
| bool RegisterCommandLine(JNIEnv* env);
|
|
|
| -#endif // CONTENT_COMMON_ANDROID_COMMAND_LINE_H_
|
| +} // namespace android
|
| +} // namespace base
|
| +
|
| +#endif // BASE_ANDROID_COMMAND_LINE_H_
|
|
|