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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 application_request.PassMessagePipe().release().value(), | 93 application_request.PassMessagePipe().release().value(), |
94 reinterpret_cast<jlong>(run_android_application_fn)); | 94 reinterpret_cast<jlong>(run_android_application_fn)); |
95 } | 95 } |
96 | 96 |
97 void AndroidHandler::Initialize(ApplicationImpl* app) { | 97 void AndroidHandler::Initialize(ApplicationImpl* app) { |
98 } | 98 } |
99 | 99 |
100 bool AndroidHandler::ConfigureIncomingConnection( | 100 bool AndroidHandler::ConfigureIncomingConnection( |
101 ApplicationConnection* connection) { | 101 ApplicationConnection* connection) { |
102 connection->AddService(&content_handler_factory_); | 102 connection->AddService(&content_handler_factory_); |
| 103 connection->AddService(&intent_manager_factory_); |
103 return true; | 104 return true; |
104 } | 105 } |
105 | 106 |
106 bool RegisterAndroidHandlerJni(JNIEnv* env) { | 107 bool RegisterAndroidHandlerJni(JNIEnv* env) { |
107 return RegisterNativesImpl(env); | 108 return RegisterNativesImpl(env); |
108 } | 109 } |
109 | 110 |
110 } // namespace shell | 111 } // namespace shell |
111 } // namespace mojo | 112 } // namespace mojo |
OLD | NEW |