diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 21:48:12 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 21:48:12 +0000 |
| commit | 7bd891779b56530e58baa770aff55b7c65956eb6 (patch) | |
| tree | 8a2d8ce25bac8f57d5faa3f56e84805dfa492431 /content/public/app | |
| parent | e135f7e496a18a6e40e87086c79c2932b3954528 (diff) | |
| download | chromium_src-7bd891779b56530e58baa770aff55b7c65956eb6.zip chromium_src-7bd891779b56530e58baa770aff55b7c65956eb6.tar.gz chromium_src-7bd891779b56530e58baa770aff55b7c65956eb6.tar.bz2 | |
As part of the content_shell bring up, some un-upstreamed features
have been disabled in browser process main related c++ and Java file.
The disabled features are guarded by !defined(ANDROID_UPSTREAM_BRINGUP).
For Java file, the code was removed.
Fixed the dependency.
- Moved the content_jni_registrar.{h|cc} and library_loader_hooks.cc content/app/android/
- Moved the android_library_loader_hooks.h to content/public/app/
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10444121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/app')
| -rw-r--r-- | content/public/app/content_main.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/content/public/app/content_main.h b/content/public/app/content_main.h index 6c58a8a..341712d8 100644 --- a/content/public/app/content_main.h +++ b/content/public/app/content_main.h @@ -32,11 +32,18 @@ class ContentMainDelegate; CONTENT_EXPORT int ContentMain(HINSTANCE instance, sandbox::SandboxInterfaceInfo* sandbox_info, ContentMainDelegate* delegate); +#elif defined(OS_ANDROID) +// In the Android, the content main starts from ContentMain.java, This function +// provides a way to set the |delegate| as ContentMainDelegate for +// ContentMainRunner. +// This should only be called once before ContentMainRunner actually running. +// The ownership of |delegate| is transferred. +void SetContentMainDelegate(ContentMainDelegate* delegate); #else CONTENT_EXPORT int ContentMain(int argc, const char** argv, ContentMainDelegate* delegate); -#endif +#endif // defined(OS_WIN) } // namespace content |