| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1166 new BrowserThreadImpl(BrowserThread::UI, base::MessageLoop::current())); | 1166 new BrowserThreadImpl(BrowserThread::UI, base::MessageLoop::current())); |
| 1167 } | 1167 } |
| 1168 | 1168 |
| 1169 int BrowserMainLoop::BrowserThreadsStarted() { | 1169 int BrowserMainLoop::BrowserThreadsStarted() { |
| 1170 TRACE_EVENT0("startup", "BrowserMainLoop::BrowserThreadsStarted"); | 1170 TRACE_EVENT0("startup", "BrowserMainLoop::BrowserThreadsStarted"); |
| 1171 | 1171 |
| 1172 // Bring up Mojo IPC and shell as early as possible. | 1172 // Bring up Mojo IPC and shell as early as possible. |
| 1173 mojo_ipc_support_.reset(new IPC::ScopedIPCSupport( | 1173 mojo_ipc_support_.reset(new IPC::ScopedIPCSupport( |
| 1174 BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO) | 1174 BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO) |
| 1175 ->task_runner())); | 1175 ->task_runner())); |
| 1176 mojo_shell_context_.reset(new MojoShellContext(file_thread_->task_runner(), | 1176 mojo_shell_context_.reset(new MojoShellContext); |
| 1177 db_thread_->task_runner())); | |
| 1178 #if defined(OS_MACOSX) | 1177 #if defined(OS_MACOSX) |
| 1179 mojo::edk::SetMachPortProvider(MachBroker::GetInstance()); | 1178 mojo::edk::SetMachPortProvider(MachBroker::GetInstance()); |
| 1180 #endif // defined(OS_MACOSX) | 1179 #endif // defined(OS_MACOSX) |
| 1181 | 1180 |
| 1182 indexed_db_thread_.reset(new base::Thread("IndexedDB")); | 1181 indexed_db_thread_.reset(new base::Thread("IndexedDB")); |
| 1183 indexed_db_thread_->Start(); | 1182 indexed_db_thread_->Start(); |
| 1184 | 1183 |
| 1185 HistogramSynchronizer::GetInstance(); | 1184 HistogramSynchronizer::GetInstance(); |
| 1186 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) | 1185 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) |
| 1187 // Up the priority of the UI thread. | 1186 // Up the priority of the UI thread. |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1451 DCHECK(is_tracing_startup_for_duration_); | 1450 DCHECK(is_tracing_startup_for_duration_); |
| 1452 | 1451 |
| 1453 is_tracing_startup_for_duration_ = false; | 1452 is_tracing_startup_for_duration_ = false; |
| 1454 TracingController::GetInstance()->StopTracing( | 1453 TracingController::GetInstance()->StopTracing( |
| 1455 TracingController::CreateFileSink( | 1454 TracingController::CreateFileSink( |
| 1456 startup_trace_file_, | 1455 startup_trace_file_, |
| 1457 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1456 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
| 1458 } | 1457 } |
| 1459 | 1458 |
| 1460 } // namespace content | 1459 } // namespace content |
| OLD | NEW |