diff options
author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/base/android/base_jni_registrar.cc | |
parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/base/android/base_jni_registrar.cc')
-rw-r--r-- | chromium/base/android/base_jni_registrar.cc | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/chromium/base/android/base_jni_registrar.cc b/chromium/base/android/base_jni_registrar.cc deleted file mode 100644 index 0645c73030c..00000000000 --- a/chromium/base/android/base_jni_registrar.cc +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/android/base_jni_registrar.h" - -#include "base/android/activity_status.h" -#include "base/android/build_info.h" -#include "base/android/cpu_features.h" -#include "base/android/important_file_writer_android.h" -#include "base/android/java_handler_thread.h" -#include "base/android/jni_android.h" -#include "base/android/jni_registrar.h" -#include "base/android/memory_pressure_listener_android.h" -#include "base/android/path_service_android.h" -#include "base/android/path_utils.h" -#include "base/android/sys_utils.h" -#include "base/android/thread_utils.h" -#include "base/basictypes.h" -#include "base/debug/trace_event.h" -#include "base/message_loop/message_pump_android.h" -#include "base/power_monitor/power_monitor_device_source_android.h" - -#if defined(GOOGLE_TV) -#include "base/android/context_types.h" -#endif - -namespace base { -namespace android { - -static RegistrationMethod kBaseRegisteredMethods[] = { - { "ActivityStatus", base::android::ActivityStatus::RegisterBindings }, - { "BuildInfo", base::android::BuildInfo::RegisterBindings }, -#if defined(GOOGLE_TV) - { "ContextTypes", base::android::RegisterContextTypes }, -#endif - { "CpuFeatures", base::android::RegisterCpuFeatures }, - { "ImportantFileWriterAndroid", - base::android::RegisterImportantFileWriterAndroid }, - { "MemoryPressureListenerAndroid", - base::android::MemoryPressureListenerAndroid::Register }, - { "JavaHandlerThread", base::android::JavaHandlerThread::RegisterBindings }, - { "PathService", base::android::RegisterPathService }, - { "PathUtils", base::android::RegisterPathUtils }, - { "SystemMessageHandler", base::MessagePumpForUI::RegisterBindings }, - { "SysUtils", base::android::SysUtils::Register }, - { "PowerMonitor", base::RegisterPowerMonitor }, - { "ThreadUtils", base::RegisterThreadUtils }, -}; - -bool RegisterJni(JNIEnv* env) { - TRACE_EVENT0("startup", "base_android::RegisterJni"); - return RegisterNativeMethods(env, kBaseRegisteredMethods, - arraysize(kBaseRegisteredMethods)); -} - -} // namespace android -} // namespace base |