| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/jni_string.h" | 5 #include "base/android/jni_string.h" |
| 6 #include "jni/MandolineActivity_jni.h" | 6 #include "jni/MandolineActivity_jni.h" |
| 7 #include "mandoline/ui/desktop_ui/public/interfaces/launch_handler.mojom.h" | 7 #include "mandoline/ui/desktop_ui/public/interfaces/launch_handler.mojom.h" |
| 8 #include "mojo/runner/android/main.h" | 8 #include "mojo/runner/android/main.h" |
| 9 #include "mojo/runner/context.h" | 9 #include "mojo/runner/context.h" |
| 10 #include "mojo/shell/connect_util.h" |
| 10 | 11 |
| 11 namespace mandoline { | 12 namespace mandoline { |
| 12 | 13 |
| 13 static void LaunchURL(JNIEnv* env, | 14 static void LaunchURL(JNIEnv* env, |
| 14 const JavaParamRef<jclass>& clazz, | 15 const JavaParamRef<jclass>& clazz, |
| 15 const JavaParamRef<jstring>& jurl) { | 16 const JavaParamRef<jstring>& jurl) { |
| 16 LaunchHandlerPtr launch_handler; | 17 LaunchHandlerPtr launch_handler; |
| 17 mojo::runner::GetContext()->application_manager()->ConnectToService( | 18 mojo::shell::ConnectToService( |
| 18 GURL("mojo:phone_ui"), &launch_handler); | 19 mojo::runner::GetContext()->application_manager(), GURL("mojo:phone_ui"), |
| 20 &launch_handler); |
| 19 launch_handler->LaunchURL( | 21 launch_handler->LaunchURL( |
| 20 base::android::ConvertJavaStringToUTF8(env, jurl)); | 22 base::android::ConvertJavaStringToUTF8(env, jurl)); |
| 21 } | 23 } |
| 22 | 24 |
| 23 bool RegisterMandolineActivity(JNIEnv* env) { | 25 bool RegisterMandolineActivity(JNIEnv* env) { |
| 24 return RegisterNativesImpl(env); | 26 return RegisterNativesImpl(env); |
| 25 } | 27 } |
| 26 | 28 |
| 27 } // namespace mandoline | 29 } // namespace mandoline |
| OLD | NEW |