Chromium Code Reviews| Index: content/browser/browser_main.h |
| =================================================================== |
| --- content/browser/browser_main.h (revision 100153) |
| +++ content/browser/browser_main.h (working copy) |
| @@ -73,11 +73,11 @@ |
| // Parts to be called by |BrowserMain()|. |
| void EarlyInitialization(); |
| + void InitializeToolkit(); |
| void MainMessageLoopStart(); |
| - void InitializeToolkit(); |
| + void MainMessageLoopRunWrapper(); |
|
tony
2011/09/08 17:21:04
Nit: I would probably name this RunMainMessageLoop
jam
2011/09/08 17:43:01
Done.
|
| - // Temporary function since not all the code from chrome is moved over yet. |
| - virtual int TemporaryContinue(); |
| + int result_code() const { return result_code_; } |
| protected: |
| // Methods to be overridden to provide platform-specific code; these |
| @@ -86,10 +86,10 @@ |
| virtual void PostEarlyInitialization(); |
| virtual void PreMainMessageLoopStart(); |
| virtual void PostMainMessageLoopStart(); |
| + virtual void PreMainMessageLoopRun(); |
| + virtual void MainMessageLoopRun(); |
| + virtual void PostMainMessageLoopRun(); |
| - // Used to initialize NSPR where appropriate. |
| - virtual void InitializeSSL(); |
| - |
| // Allows an embedder to do any extra toolkit initialization. |
| virtual void ToolkitInitialized(); |
| @@ -103,6 +103,7 @@ |
| MessageLoop& main_message_loop() const { |
| return *main_message_loop_; |
| } |
| + void set_result_code(int result_code) { result_code_ = result_code; } |
| private: |
| void InitializeMainThread(); |
| @@ -111,6 +112,7 @@ |
| const MainFunctionParams& parameters_; |
| const CommandLine& parsed_command_line_; |
| + int result_code_; |
| // Members initialized in |MainMessageLoopStart()| --------------------------- |
| scoped_ptr<MessageLoop> main_message_loop_; |