| Index: content/public/app/content_main.h
|
| diff --git a/content/public/app/content_main.h b/content/public/app/content_main.h
|
| index 6c58a8ae154684398668359933fa14c309887c34..341712d8db6292b169c5b9c16e5d5aeb25f09f33 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
|
|
|
|
|