Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Side by Side Diff: services/java_handler/java_handler.cc

Issue 1979683002: ApplicationConnection devolution, part 2.4. (Closed) Base URL: https://github.com/domokit/mojo.git@work795_app_conn_devo_2.3-x-work794_app_conn_devo_2.2
Patch Set: so much doh Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « services/dart/content_handler_main.cc ('k') | services/js/content_handler_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "services/java_handler/java_handler.h" 5 #include "services/java_handler/java_handler.h"
6 6
7 #include "base/android/base_jni_onload.h" 7 #include "base/android/base_jni_onload.h"
8 #include "base/android/base_jni_registrar.h" 8 #include "base/android/base_jni_registrar.h"
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 extracted_path.size())); 113 extracted_path.size()));
114 *cache_dir = base::FilePath(std::string( 114 *cache_dir = base::FilePath(std::string(
115 reinterpret_cast<char*>(&cache_path.front()), cache_path.size())); 115 reinterpret_cast<char*>(&cache_path.front()), cache_path.size()));
116 } 116 }
117 callback.Run(); 117 callback.Run();
118 }); 118 });
119 } 119 }
120 120
121 bool JavaHandler::ConfigureIncomingConnection( 121 bool JavaHandler::ConfigureIncomingConnection(
122 mojo::ApplicationConnection* connection) { 122 mojo::ApplicationConnection* connection) {
123 connection->AddService(&content_handler_factory_); 123 connection->GetServiceProviderImpl().AddService<mojo::ContentHandler>(
124 content_handler_factory_.GetInterfaceRequestHandler());
124 return true; 125 return true;
125 } 126 }
126 127
127 void PreInvokeEvent(JNIEnv* env, jclass jcaller) { 128 void PreInvokeEvent(JNIEnv* env, jclass jcaller) {
128 TRACE_EVENT_END0("java_handler", "JavaHandler::RunApplication"); 129 TRACE_EVENT_END0("java_handler", "JavaHandler::RunApplication");
129 } 130 }
130 131
131 } // namespace android 132 } // namespace android
132 } // namespace services 133 } // namespace services
133 134
(...skipping 18 matching lines...) Expand all
152 return JNI_VERSION_1_4; 153 return JNI_VERSION_1_4;
153 } 154 }
154 155
155 // This is needed because the application needs to access the application 156 // This is needed because the application needs to access the application
156 // context. 157 // context.
157 extern "C" JNI_EXPORT void InitApplicationContext( 158 extern "C" JNI_EXPORT void InitApplicationContext(
158 const base::android::JavaRef<jobject>& context) { 159 const base::android::JavaRef<jobject>& context) {
159 JNIEnv* env = base::android::AttachCurrentThread(); 160 JNIEnv* env = base::android::AttachCurrentThread();
160 base::android::InitApplicationContext(env, context); 161 base::android::InitApplicationContext(env, context);
161 } 162 }
OLDNEW
« no previous file with comments | « services/dart/content_handler_main.cc ('k') | services/js/content_handler_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698