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

Side by Side Diff: content/common/android/common_jni_registrar.cc

Issue 10695020: upstream SurfaceTextureListener and SurfaceTextureBridge class for android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing nits Created 8 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/common/android/common_jni_registrar.h" 5 #include "content/common/android/common_jni_registrar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "content/common/android/command_line.h" 9 #include "content/common/android/command_line.h"
10 #include "content/common/android/surface_callback.h" 10 #include "content/common/android/surface_callback.h"
11 #include "content/common/android/surface_texture_listener.h"
11 #include "content/common/android/trace_event_binding.h" 12 #include "content/common/android/trace_event_binding.h"
12 13
13 namespace { 14 namespace {
14 base::android::RegistrationMethod kContentRegisteredMethods[] = { 15 base::android::RegistrationMethod kContentRegisteredMethods[] = {
15 { "CommandLine", RegisterCommandLine }, 16 { "CommandLine", RegisterCommandLine },
16 { "SurfaceCallback", content::RegisterSurfaceCallback }, 17 { "SurfaceCallback", content::RegisterSurfaceCallback },
18 { "SurfaceTextureListener",
19 content::SurfaceTextureListener::RegisterSurfaceTextureListener },
17 { "TraceEvent", RegisterTraceEvent }, 20 { "TraceEvent", RegisterTraceEvent },
18 }; 21 };
19 22
20 } // namespace 23 } // namespace
21 24
22 namespace content { 25 namespace content {
23 namespace android { 26 namespace android {
24 27
25 bool RegisterCommonJni(JNIEnv* env) { 28 bool RegisterCommonJni(JNIEnv* env) {
26 return RegisterNativeMethods(env, kContentRegisteredMethods, 29 return RegisterNativeMethods(env, kContentRegisteredMethods,
27 arraysize(kContentRegisteredMethods)); 30 arraysize(kContentRegisteredMethods));
28 } 31 }
29 32
30 } // namespace android 33 } // namespace android
31 } // namespace content 34 } // namespace content
OLDNEW
« no previous file with comments | « base/android/jni_generator/jni_generator.py ('k') | content/common/android/surface_texture_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698