Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/browser_main_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 239 } | 239 } |
| 240 #endif | 240 #endif |
| 241 | 241 |
| 242 main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); | 242 main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); |
| 243 | 243 |
| 244 InitializeMainThread(); | 244 InitializeMainThread(); |
| 245 | 245 |
| 246 system_monitor_.reset(new base::SystemMonitor); | 246 system_monitor_.reset(new base::SystemMonitor); |
| 247 hi_res_timer_manager_.reset(new HighResolutionTimerManager); | 247 hi_res_timer_manager_.reset(new HighResolutionTimerManager); |
| 248 | 248 |
| 249 #if !defined(OS_CHROMEOS) | |
|
satorux1
2011/10/29 02:28:48
This looks wrong. network_change_notifier_ will be
| |
| 249 network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); | 250 network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); |
| 251 #endif | |
| 250 | 252 |
| 251 for (size_t i = 0; i < parts_list_.size(); ++i) | 253 for (size_t i = 0; i < parts_list_.size(); ++i) |
| 252 parts_list_[i]->PostMainMessageLoopStart(); | 254 parts_list_[i]->PostMainMessageLoopStart(); |
| 253 } | 255 } |
| 254 | 256 |
| 255 void BrowserMainLoop::RunMainMessageLoopParts( | 257 void BrowserMainLoop::RunMainMessageLoopParts( |
| 256 bool* completed_main_message_loop) { | 258 bool* completed_main_message_loop) { |
| 257 for (size_t i = 0; i < parts_list_.size(); ++i) | 259 for (size_t i = 0; i < parts_list_.size(); ++i) |
| 258 parts_list_[i]->PreMainMessageLoopRun(); | 260 parts_list_[i]->PreMainMessageLoopRun(); |
| 259 | 261 |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 359 MessageLoopForUI::current()->PostTask(FROM_HERE, parameters_.ui_task); | 361 MessageLoopForUI::current()->PostTask(FROM_HERE, parameters_.ui_task); |
| 360 | 362 |
| 361 #if defined(OS_MACOSX) | 363 #if defined(OS_MACOSX) |
| 362 MessageLoopForUI::current()->Run(); | 364 MessageLoopForUI::current()->Run(); |
| 363 #else | 365 #else |
| 364 MessageLoopForUI::current()->RunWithDispatcher(NULL); | 366 MessageLoopForUI::current()->RunWithDispatcher(NULL); |
| 365 #endif | 367 #endif |
| 366 } | 368 } |
| 367 | 369 |
| 368 } // namespace content | 370 } // namespace content |
| OLD | NEW |