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

Side by Side Diff: base/android/command_line_android.cc

Issue 817653003: Update from https://crrev.com/309717 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « DEPS ('k') | base/callback_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/android/command_line_android.h" 5 #include "base/android/command_line_android.h"
6 6
7 #include "base/android/jni_array.h" 7 #include "base/android/jni_array.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "jni/CommandLine_jni.h" 11 #include "jni/CommandLine_jni.h"
12 12
13 using base::android::ConvertUTF8ToJavaString; 13 using base::android::ConvertUTF8ToJavaString;
14 using base::android::ConvertJavaStringToUTF8; 14 using base::android::ConvertJavaStringToUTF8;
15 using base::CommandLine;
15 16
16 namespace { 17 namespace {
17 18
18 void AppendJavaStringArrayToCommandLine(JNIEnv* env, 19 void AppendJavaStringArrayToCommandLine(JNIEnv* env,
19 jobjectArray array, 20 jobjectArray array,
20 bool includes_program) { 21 bool includes_program) {
21 std::vector<std::string> vec; 22 std::vector<std::string> vec;
22 if (array) 23 if (array)
23 base::android::AppendJavaStringArrayToStringVector(env, array, &vec); 24 base::android::AppendJavaStringArrayToStringVector(env, array, &vec);
24 if (!includes_program) 25 if (!includes_program)
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 CommandLine::Init(0, NULL); 77 CommandLine::Init(0, NULL);
77 AppendJavaStringArrayToCommandLine(env, array, true); 78 AppendJavaStringArrayToCommandLine(env, array, true);
78 } 79 }
79 80
80 bool RegisterCommandLine(JNIEnv* env) { 81 bool RegisterCommandLine(JNIEnv* env) {
81 return RegisterNativesImpl(env); 82 return RegisterNativesImpl(env);
82 } 83 }
83 84
84 } // namespace android 85 } // namespace android
85 } // namespace base 86 } // namespace base
OLDNEW
« no previous file with comments | « DEPS ('k') | base/callback_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698