Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(862)

Unified Diff: content/app/android/library_loader_hooks.cc

Issue 62333025: [Android] Move CommandLine.java to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years, 1 month 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
Index: content/app/android/library_loader_hooks.cc
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index 837bfaa445eaffaef01c069ed20dc0fcd84d9e73..90a27c05950aea99574312f02905b169f7f8e28d 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();

Powered by Google App Engine
This is Rietveld 408576698