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

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

Issue 10809016: Move content_shell and content_browsertests code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix android 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
« no previous file with comments | « no previous file | content/shell/shell.h » ('j') | 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/android_library_loader_hooks.h"
(...skipping 14 matching lines...) Expand all
25 if (!content::RegisterLibraryLoaderEntryHook(env)) { 25 if (!content::RegisterLibraryLoaderEntryHook(env)) {
26 return -1; 26 return -1;
27 } 27 }
28 28
29 // To be called only from the UI thread. If loading the library is done on 29 // To be called only from the UI thread. If loading the library is done on
30 // a separate thread, this should be moved elsewhere. 30 // a separate thread, this should be moved elsewhere.
31 if (!base::android::RegisterNativeMethods(env, kRegistrationMethods, 31 if (!base::android::RegisterNativeMethods(env, kRegistrationMethods,
32 arraysize(kRegistrationMethods))) 32 arraysize(kRegistrationMethods)))
33 return -1; 33 return -1;
34 34
35 content::SetContentMainDelegate(new ShellMainDelegate()); 35 content::SetContentMainDelegate(new content::ShellMainDelegate());
36 36
37 return JNI_VERSION_1_4; 37 return JNI_VERSION_1_4;
38 } 38 }
OLDNEW
« no previous file with comments | « no previous file | content/shell/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698