Chromium Code Reviews| 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..12626e3885abd99159dd39056e3a9ea2c89aa51c 100644 |
| --- a/content/public/app/content_main.h |
| +++ b/content/public/app/content_main.h |
| @@ -21,6 +21,7 @@ namespace content { |
| class ContentMainDelegate; |
| +#if !defined(OS_ANDROID) |
|
jam
2012/06/01 23:40:00
nit: i think it would be more readable if you chan
michaelbai
2012/06/04 17:39:36
Done.
|
| // ContentMain should be called from the embedder's main() function to do the |
| // initial setup for every process. The embedder has a chance to customize |
| // startup using the ContentMainDelegate interface. The embedder can also pass |
| @@ -36,7 +37,16 @@ CONTENT_EXPORT int ContentMain(HINSTANCE instance, |
| CONTENT_EXPORT int ContentMain(int argc, |
| const char** argv, |
| ContentMainDelegate* delegate); |
| -#endif |
| +#endif // defined(OS_WIN) |
| + |
| +#else // !defined(OS_ANDROID) |
| +// In the Android, the content main starts from ContentMain.java, This function |
| +// provides a way to initialize the |delegate| as ContentMainDelegate for |
| +// ContentMainRunner. |
| +// The ownership of |delegate| is transferred. |
| +void InitContentMainDelegate(ContentMainDelegate* delegate); |
|
jam
2012/06/01 23:40:00
nit: SetContentMainDelegate
michaelbai
2012/06/04 17:39:36
I used 'Init' instead of 'Set' because it can only
jam
2012/06/04 19:26:43
Init sounds like this function will initialize the
|
| + |
| +#endif // !defined(OS_ANDROID) |
| } // namespace content |