| OLD | NEW |
| 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 "shell/android/main.h" | 5 #include "shell/android/main.h" |
| 6 | 6 |
| 7 #include "base/android/fifo_utils.h" | 7 #include "base/android/fifo_utils.h" |
| 8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
| 9 #include "base/android/jni_array.h" | 9 #include "base/android/jni_array.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 base::CommandLine::ForCurrentProcess()->AppendArg( | 207 base::CommandLine::ForCurrentProcess()->AppendArg( |
| 208 base::android::ConvertJavaStringToUTF8(env, jurl)); | 208 base::android::ConvertJavaStringToUTF8(env, jurl)); |
| 209 } | 209 } |
| 210 | 210 |
| 211 bool RegisterShellMain(JNIEnv* env) { | 211 bool RegisterShellMain(JNIEnv* env) { |
| 212 return RegisterNativesImpl(env); | 212 return RegisterNativesImpl(env); |
| 213 } | 213 } |
| 214 | 214 |
| 215 } // namespace shell | 215 } // namespace shell |
| 216 } // namespace mojo | 216 } // namespace mojo |
| 217 |
| 218 // TODO(vtl): Even though main() should never be called, mojo_shell fails to |
| 219 // link without it. Figure out if we can avoid this. |
| 220 int main(int argc, char** argv) { |
| 221 NOTREACHED(); |
| 222 } |
| OLD | NEW |