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

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

Issue 10444113: Fixed the dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync again 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
« no previous file with comments | « content/public/browser/android_library_loader_hooks.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/content_main_runner.h" 11 #include "content/public/app/content_main_runner.h"
11 #include "content/public/browser/android_library_loader_hooks.h"
12 #include "content/shell/shell_main_delegate.h" 12 #include "content/shell/shell_main_delegate.h"
13 #include "content/shell/android/shell_manager.h" 13 #include "content/shell/android/shell_manager.h"
14 #include "content/shell/android/shell_view.h" 14 #include "content/shell/android/shell_view.h"
15 15
16 static base::android::RegistrationMethod kRegistrationMethods[] = { 16 static base::android::RegistrationMethod kRegistrationMethods[] = {
17 { "ShellManager", content::RegisterShellManager }, 17 { "ShellManager", content::RegisterShellManager },
18 { "ShellView", content::ShellView::Register }, 18 { "ShellView", content::ShellView::Register },
19 }; 19 };
20 20
21 namespace { 21 namespace {
(...skipping 28 matching lines...) Expand all
50 50
51 return JNI_VERSION_1_4; 51 return JNI_VERSION_1_4;
52 } 52 }
53 53
54 54
55 JNI_EXPORT void JNI_OnUnload(JavaVM* vm, void* reserved) { 55 JNI_EXPORT void JNI_OnUnload(JavaVM* vm, void* reserved) {
56 delete g_content_main_runner; 56 delete g_content_main_runner;
57 g_content_main_runner = NULL; 57 g_content_main_runner = NULL;
58 } 58 }
59 59
OLDNEW
« no previous file with comments | « content/public/browser/android_library_loader_hooks.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698