| 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 "mojo/shell/standalone/android/android_handler.h" | 5 #include "mojo/shell/standalone/android/android_handler.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/android/context_utils.h" | 10 #include "base/android/context_utils.h" |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 env, GetApplicationContext(), j_archive_path.obj(), | 164 env, GetApplicationContext(), j_archive_path.obj(), |
| 165 request.PassMessagePipe().release().value(), | 165 request.PassMessagePipe().release().value(), |
| 166 reinterpret_cast<jlong>(run_android_application_fn)); | 166 reinterpret_cast<jlong>(run_android_application_fn)); |
| 167 } | 167 } |
| 168 | 168 |
| 169 void AndroidHandler::Initialize(Shell* shell, | 169 void AndroidHandler::Initialize(Shell* shell, |
| 170 const std::string& url, | 170 const std::string& url, |
| 171 uint32_t id) {} | 171 uint32_t id) {} |
| 172 | 172 |
| 173 bool AndroidHandler::AcceptConnection(Connection* connection) { | 173 bool AndroidHandler::AcceptConnection(Connection* connection) { |
| 174 connection->AddService(&content_handler_factory_); | 174 connection->AddInterface(&content_handler_factory_); |
| 175 return true; | 175 return true; |
| 176 } | 176 } |
| 177 | 177 |
| 178 bool RegisterAndroidHandlerJni(JNIEnv* env) { | 178 bool RegisterAndroidHandlerJni(JNIEnv* env) { |
| 179 return RegisterNativesImpl(env); | 179 return RegisterNativesImpl(env); |
| 180 } | 180 } |
| 181 | 181 |
| 182 } // namespace shell | 182 } // namespace shell |
| 183 } // namespace mojo | 183 } // namespace mojo |
| OLD | NEW |