| 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 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 #include "ui/gfx/x/x11_types.h" | 170 #include "ui/gfx/x/x11_types.h" |
| 171 #endif | 171 #endif |
| 172 | 172 |
| 173 #if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL) | 173 #if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL) |
| 174 #include "crypto/nss_util.h" | 174 #include "crypto/nss_util.h" |
| 175 #endif | 175 #endif |
| 176 | 176 |
| 177 #if defined(MOJO_SHELL_CLIENT) | 177 #if defined(MOJO_SHELL_CLIENT) |
| 178 #include "components/mus/public/interfaces/window_manager.mojom.h" | 178 #include "components/mus/public/interfaces/window_manager.mojom.h" |
| 179 #include "content/common/mojo/mojo_shell_connection_impl.h" | 179 #include "content/common/mojo/mojo_shell_connection_impl.h" |
| 180 #include "mojo/application/public/cpp/application_impl.h" | |
| 181 #include "mojo/converters/network/network_type_converters.h" | 180 #include "mojo/converters/network/network_type_converters.h" |
| 181 #include "mojo/shell/public/cpp/application_impl.h" |
| 182 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" | 182 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
| 183 #include "ui/views/mus/window_manager_connection.h" | 183 #include "ui/views/mus/window_manager_connection.h" |
| 184 #endif | 184 #endif |
| 185 | 185 |
| 186 // One of the linux specific headers defines this as a macro. | 186 // One of the linux specific headers defines this as a macro. |
| 187 #ifdef DestroyAll | 187 #ifdef DestroyAll |
| 188 #undef DestroyAll | 188 #undef DestroyAll |
| 189 #endif | 189 #endif |
| 190 | 190 |
| 191 namespace content { | 191 namespace content { |
| (...skipping 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1462 DCHECK(is_tracing_startup_for_duration_); | 1462 DCHECK(is_tracing_startup_for_duration_); |
| 1463 | 1463 |
| 1464 is_tracing_startup_for_duration_ = false; | 1464 is_tracing_startup_for_duration_ = false; |
| 1465 TracingController::GetInstance()->StopTracing( | 1465 TracingController::GetInstance()->StopTracing( |
| 1466 TracingController::CreateFileSink( | 1466 TracingController::CreateFileSink( |
| 1467 startup_trace_file_, | 1467 startup_trace_file_, |
| 1468 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1468 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
| 1469 } | 1469 } |
| 1470 | 1470 |
| 1471 } // namespace content | 1471 } // namespace content |
| OLD | NEW |