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

Side by Side Diff: mojo/shell/standalone/android/android_handler.cc

Issue 1681813002: Rename Connection::AddService/ConnectToService to Connection::AddInterface/GetInterface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@interface_binder
Patch Set: . Created 4 years, 10 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 | « mojo/shell/shell_application_delegate.cc ('k') | no next file » | 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 "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
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
OLDNEW
« no previous file with comments | « mojo/shell/shell_application_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698