| Index: services/java_handler/java_handler.cc
|
| diff --git a/services/android/java_handler.cc b/services/java_handler/java_handler.cc
|
| similarity index 97%
|
| rename from services/android/java_handler.cc
|
| rename to services/java_handler/java_handler.cc
|
| index 63a7a52349ae39033d1b2aec9fce9911c4a21963..8079eda0b87fd1aafc6112323089294817febfd5 100644
|
| --- a/services/android/java_handler.cc
|
| +++ b/services/java_handler/java_handler.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "services/android/java_handler.h"
|
| +#include "services/java_handler/java_handler.h"
|
|
|
| #include "base/android/base_jni_onload.h"
|
| #include "base/android/base_jni_registrar.h"
|
| @@ -52,11 +52,9 @@ bool RegisterJNI(JNIEnv* env) {
|
| namespace services {
|
| namespace android {
|
|
|
| -JavaHandler::JavaHandler() : content_handler_factory_(this) {
|
| -}
|
| +JavaHandler::JavaHandler() : content_handler_factory_(this) {}
|
|
|
| -JavaHandler::~JavaHandler() {
|
| -}
|
| +JavaHandler::~JavaHandler() {}
|
|
|
| void JavaHandler::RunApplication(
|
| mojo::InterfaceRequest<mojo::Application> application_request,
|
| @@ -80,7 +78,6 @@ void JavaHandler::RunApplication(
|
| base::RunLoop().Run();
|
| }
|
|
|
| -
|
| jobject context = base::android::GetApplicationContext();
|
| ScopedJavaLocalRef<jstring> j_archive_path =
|
| ConvertUTF8ToJavaString(env, archive_path.value());
|
| @@ -161,4 +158,3 @@ extern "C" JNI_EXPORT void InitApplicationContext(
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| base::android::InitApplicationContext(env, context);
|
| }
|
| -
|
|
|