| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/android_handler.h" | 5 #include "shell/android/android_handler.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 Java_AndroidHandler_bootstrap( | 89 Java_AndroidHandler_bootstrap( |
| 90 env, GetApplicationContext(), j_archive_path.obj(), | 90 env, GetApplicationContext(), j_archive_path.obj(), |
| 91 application_request.PassMessagePipe().release().value(), | 91 application_request.PassMessagePipe().release().value(), |
| 92 reinterpret_cast<jlong>(run_android_application_fn)); | 92 reinterpret_cast<jlong>(run_android_application_fn)); |
| 93 } | 93 } |
| 94 | 94 |
| 95 void AndroidHandler::Initialize(ApplicationImpl* app) { | 95 void AndroidHandler::Initialize(ApplicationImpl* app) { |
| 96 } | 96 } |
| 97 | 97 |
| 98 bool AndroidHandler::ConfigureIncomingConnection( | 98 bool AndroidHandler::ConfigureIncomingConnection( |
| 99 ApplicationConnection* connection) { | 99 ApplicationConnection* connection, |
| 100 const std::string& url) { |
| 100 connection->AddService(&content_handler_factory_); | 101 connection->AddService(&content_handler_factory_); |
| 101 return true; | 102 return true; |
| 102 } | 103 } |
| 103 | 104 |
| 104 bool RegisterAndroidHandlerJni(JNIEnv* env) { | 105 bool RegisterAndroidHandlerJni(JNIEnv* env) { |
| 105 return RegisterNativesImpl(env); | 106 return RegisterNativesImpl(env); |
| 106 } | 107 } |
| 107 | 108 |
| 108 } // namespace mojo | 109 } // namespace mojo |
| OLD | NEW |