diff options
| author | jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 03:01:07 +0000 |
|---|---|---|
| committer | jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 03:01:07 +0000 |
| commit | b873bc8b51dbee1193f3e6b48db0d08a86e3badc (patch) | |
| tree | 4e5ef2799807c547deb9af271b3af6b5a77fb635 /content/app | |
| parent | ccb962dfd9abe9fe9c990372a56e04cc9aa8ddb8 (diff) | |
| download | chromium_src-b873bc8b51dbee1193f3e6b48db0d08a86e3badc.zip chromium_src-b873bc8b51dbee1193f3e6b48db0d08a86e3badc.tar.gz chromium_src-b873bc8b51dbee1193f3e6b48db0d08a86e3badc.tar.bz2 | |
[Android] Move CommandLine.java to base
The native CommandLine lives in base, and so too should the Java wrapper. Move
CommandLine.java to base, updating all references and factoring out previously
contained switches to BaseSwitches and ContentSwitches.
BUG=320747
TBR=ajwong@chromium.org
Review URL: https://codereview.chromium.org/62333025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index 837bfaa..90a27c0 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -5,6 +5,7 @@ #include "content/public/app/android_library_loader_hooks.h" #include "base/android/base_jni_registrar.h" +#include "base/android/command_line.h" #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" #include "base/android/jni_string.h" @@ -20,7 +21,6 @@ #include "content/app/android/app_jni_registrar.h" #include "content/browser/android/browser_jni_registrar.h" #include "content/child/android/child_jni_registrar.h" -#include "content/common/android/command_line.h" #include "content/common/android/common_jni_registrar.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" @@ -83,7 +83,7 @@ bool EnsureJniRegistered(JNIEnv* env) { static jint LibraryLoaded(JNIEnv* env, jclass clazz, jobjectArray init_command_line) { - InitNativeCommandLineFromJavaArray(env, init_command_line); + base::android::InitNativeCommandLineFromJavaArray(env, init_command_line); CommandLine* command_line = CommandLine::ForCurrentProcess(); |