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

Unified Diff: content/public/app/content_main.h

Issue 10444121: Added android_browser_process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698