Index: content/public/app/content_main.h |
=================================================================== |
--- content/public/app/content_main.h (revision 257128) |
+++ content/public/app/content_main.h (working copy) |
@@ -7,6 +7,7 @@ |
#include <stddef.h> |
+#include "base/callback_forward.h" |
#include "build/build_config.h" |
#include "content/common/content_export.h" |
@@ -23,15 +24,15 @@ |
struct ContentMainParams { |
explicit ContentMainParams(ContentMainDelegate* delegate) |
- : delegate(delegate) |
+ : delegate(delegate), |
#if defined(OS_WIN) |
- , instance(NULL), |
- sandbox_info(NULL) |
+ instance(NULL), |
+ sandbox_info(NULL), |
#elif !defined(OS_ANDROID) |
- , argc(0), |
- argv(NULL) |
+ argc(0), |
+ argv(NULL), |
#endif |
- { |
+ ui_task(NULL) { |
} |
ContentMainDelegate* delegate; |
@@ -46,6 +47,10 @@ |
int argc; |
const char** argv; |
#endif |
+ |
+ // Used by InProcessBrowserTest. If non-null BrowserMain schedules this |
+ // task to run on the MessageLoop and BrowserInit is not invoked. |
+ base::Closure* ui_task; |
sky
2014/03/14 21:35:56
Document ownership.
jam
2014/03/14 22:35:40
Done.
|
}; |
#if defined(OS_ANDROID) |