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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Addressing most feedback, making this work on device. Created 3 years, 6 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/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index aa8fa9b89f30b8b5346cb10ad3302ffa60dbb203..7c4b7cdb180c75e9adf88a1fd222ebf240917490 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -958,8 +958,6 @@ int BrowserMainLoop::CreateThreads() {
base::Thread::Options io_message_loop_options;
io_message_loop_options.message_loop_type = base::MessageLoop::TYPE_IO;
- base::Thread::Options ui_message_loop_options;
- ui_message_loop_options.message_loop_type = base::MessageLoop::TYPE_UI;
const bool redirect_nonUInonIO_browser_threads =
GetContentClient()
@@ -1614,6 +1612,7 @@ void BrowserMainLoop::InitializeMemoryManagementComponent() {
}
bool BrowserMainLoop::InitializeToolkit() {
+ LOG(ERROR) << "BrowserMainLoop::InitializeToolkit()";
TRACE_EVENT0("startup", "BrowserMainLoop::InitializeToolkit");
// TODO(evan): this function is rather subtle, due to the variety
@@ -1642,6 +1641,7 @@ bool BrowserMainLoop::InitializeToolkit() {
}
#endif
+ LOG(ERROR) << 1;
// Env creates the compositor. Aura widgets need the compositor to be created
// before they can be initialized by the browser.
env_ = aura::Env::CreateInstance(parameters_.env_mode);

Powered by Google App Engine
This is Rietveld 408576698