From 9e49959b0e6e940c39359f5f05f9d5da6032a869 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Mon, 6 Feb 2012 18:46:35 +0000 Subject: Revert "Support sharing of ContentMain and BrowserMain code with embedded use cases." This reverts commit r120574. Test failures. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120581 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/browser_main_loop.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'content/browser/browser_main_loop.cc') diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 6a9e38c..563c310 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -294,9 +294,7 @@ void BrowserMainLoop::MainMessageLoopStart() { // Must first NULL pointer or we hit a DCHECK that the newly constructed // message loop is the current one. main_message_loop_.reset(); - main_message_loop_.reset(parts_->GetMainMessageLoop()); - if (!main_message_loop_.get()) - main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); + main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); InitializeMainThread(); @@ -323,7 +321,8 @@ void BrowserMainLoop::MainMessageLoopStart() { parts_->PostMainMessageLoopStart(); } -void BrowserMainLoop::CreateThreads() { +void BrowserMainLoop::RunMainMessageLoopParts( + bool* completed_main_message_loop) { if (parts_.get()) result_code_ = parts_->PreCreateThreads(); @@ -405,13 +404,10 @@ void BrowserMainLoop::CreateThreads() { if (parts_.get()) parts_->PreMainMessageLoopRun(); + TRACE_EVENT_BEGIN_ETW("BrowserMain:MESSAGE_LOOP", 0, ""); // If the UI thread blocks, the whole UI is unresponsive. // Do not allow disk IO from the UI thread. base::ThreadRestrictions::SetIOAllowed(false); -} - -void BrowserMainLoop::RunMainMessageLoopParts() { - TRACE_EVENT_BEGIN_ETW("BrowserMain:MESSAGE_LOOP", 0, ""); bool ran_main_loop = false; if (parts_.get()) @@ -421,6 +417,11 @@ void BrowserMainLoop::RunMainMessageLoopParts() { MainMessageLoopRun(); TRACE_EVENT_END_ETW("BrowserMain:MESSAGE_LOOP", 0, ""); + + if (completed_main_message_loop) + *completed_main_message_loop = true; + + ShutdownThreadsAndCleanUp(); } void BrowserMainLoop::ShutdownThreadsAndCleanUp() { -- cgit v1.1