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

Side by Side Diff: content/shell/android/shell_library_loader.cc

Issue 12047068: Add apk for running content_browsertests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/debug/debugger.h" 6 #include "base/debug/debugger.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_registrar.h" 9 #include "base/android/jni_registrar.h"
10 #include "content/public/app/android_library_loader_hooks.h" 10 #include "content/public/app/android_library_loader_hooks.h"
11 #include "content/public/app/content_main.h" 11 #include "content/public/app/content_main.h"
12 #include "content/public/browser/android/compositor.h" 12 #include "content/public/browser/android/compositor.h"
13 #include "content/shell/android/shell_manager.h" 13 #include "content/shell/android/shell_jni_registrar.h"
14 #include "content/shell/shell.h"
15 #include "content/shell/shell_main_delegate.h" 14 #include "content/shell/shell_main_delegate.h"
16 15
17 static base::android::RegistrationMethod kRegistrationMethods[] = {
18 { "Shell", content::Shell::Register },
19 { "ShellManager", content::RegisterShellManager },
20 };
21
22 // This is called by the VM when the shared library is first loaded. 16 // This is called by the VM when the shared library is first loaded.
23 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 17 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
24 base::android::InitVM(vm); 18 base::android::InitVM(vm);
25 JNIEnv* env = base::android::AttachCurrentThread(); 19 JNIEnv* env = base::android::AttachCurrentThread();
20
26 if (!content::RegisterLibraryLoaderEntryHook(env)) 21 if (!content::RegisterLibraryLoaderEntryHook(env))
27 return -1; 22 return -1;
28 23
29 // To be called only from the UI thread. If loading the library is done on 24 // To be called only from the UI thread. If loading the library is done on
30 // a separate thread, this should be moved elsewhere. 25 // a separate thread, this should be moved elsewhere.
31 if (!base::android::RegisterNativeMethods(env, kRegistrationMethods, 26 if (!content::android::RegisterShellJni(env))
32 arraysize(kRegistrationMethods)))
33 return -1; 27 return -1;
34 28
35 content::Compositor::Initialize(); 29 content::Compositor::Initialize();
36
37 content::SetContentMainDelegate(new content::ShellMainDelegate()); 30 content::SetContentMainDelegate(new content::ShellMainDelegate());
38
39 return JNI_VERSION_1_4; 31 return JNI_VERSION_1_4;
40 } 32 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698