content/app/android/content_jni_registrar.cc - Issue 10532155: Upstream some more content/ DEPS-related cleanup.

Side by Side Diff: content/app/android/content_jni_registrar.cc

Issue 10532155: Upstream some more content/ DEPS-related cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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

OLD	NEW
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/app/android/content_jni_registrar.h"	5 #include "content/app/android/content_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/app/android/content_main.h"	9 #include "content/app/android/content_main.h"

10 #include "content/app/android/sandboxed_process_service.h"	10 #include "content/app/android/sandboxed_process_service.h"

11 #include "content/browser/android/android_browser_process.h"	11 #include "content/browser/android/android_browser_process.h"

12 #include "content/browser/android/command_line.h"

13 #include "content/browser/android/device_info.h"	12 #include "content/browser/android/device_info.h"

14 #include "content/browser/android/download_controller.h"	13 #include "content/browser/android/download_controller.h"

15 #include "content/browser/android/jni_helper.h"

16 #include "content/browser/android/sandboxed_process_launcher.h"	14 #include "content/browser/android/sandboxed_process_launcher.h"

17 #include "content/browser/android/trace_event_binding.h"	15 #include "content/common/android/command_line.h"

18 #include "content/common/android/surface_callback.h"	16 #include "content/common/android/surface_callback.h"

	17 #include "content/common/android/trace_event_binding.h"

	18 #include "content/public/browser/android/bitmap_holder.h"

	19

	20 bool RegisterBitmapHolder(JNIEnv* env);

19	21

20 namespace content {	22 namespace content {

21 namespace android {	23 namespace android {

22	24

23 base::android::RegistrationMethod kContentRegisteredMethods[] = {	25 base::android::RegistrationMethod kContentRegisteredMethods[] = {

24 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },	26 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },

25 { "CommandLine", RegisterCommandLine },	27 { "CommandLine", RegisterCommandLine },

26 { "ContentMain", content::RegisterContentMain },	28 { "ContentMain", content::RegisterContentMain },

27 { "DeviceInfo", RegisterDeviceInfo },	29 { "DeviceInfo", RegisterDeviceInfo },

28 { "DownloadController", DownloadController::RegisterDownloadController },	30 { "DownloadController", DownloadController::RegisterDownloadController },

29 { "JniHelper", RegisterJniHelper },	31 { "BitmapHolder", RegisterBitmapHolder },
	Yaron 2012/06/15 17:40:35 Nit: sort Nit: sort no sievers 2012/06/15 20:34:41 Done. Show quoted text On 2012/06/15 17:40:35, Yaron wrote: > Nit: sort Done.
30 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher },	32 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher },

31 { "SandboxedProcessService", content::RegisterSandboxedProcessService },	33 { "SandboxedProcessService", content::RegisterSandboxedProcessService },

32 { "SurfaceCallback", content::RegisterSurfaceCallback },	34 { "SurfaceCallback", content::RegisterSurfaceCallback },

33 { "TraceEvent", RegisterTraceEvent },	35 { "TraceEvent", RegisterTraceEvent },

34 };	36 };

35	37

36 bool RegisterJni(JNIEnv* env) {	38 bool RegisterJni(JNIEnv* env) {

37 return RegisterNativeMethods(env, kContentRegisteredMethods,	39 return RegisterNativeMethods(env, kContentRegisteredMethods,

38 arraysize(kContentRegisteredMethods));	40 arraysize(kContentRegisteredMethods));

39 }	41 }

40	42

41 } // namespace android	43 } // namespace android

42 } // namespace content	44 } // namespace content

OLD	NEW

« no previous file with comments | « no previous file | content/app/android/library_loader_hooks.cc » ('j') | content/app/android/library_loader_hooks.cc » ('J')