| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 #include "content/public/common/content_switches.h" | 73 #include "content/public/common/content_switches.h" |
| 74 #include "content/public/common/main_function_params.h" | 74 #include "content/public/common/main_function_params.h" |
| 75 #include "content/public/common/result_codes.h" | 75 #include "content/public/common/result_codes.h" |
| 76 #include "device/battery/battery_status_service.h" | 76 #include "device/battery/battery_status_service.h" |
| 77 #include "ipc/mojo/scoped_ipc_support.h" | 77 #include "ipc/mojo/scoped_ipc_support.h" |
| 78 #include "media/audio/audio_manager.h" | 78 #include "media/audio/audio_manager.h" |
| 79 #include "media/base/media.h" | 79 #include "media/base/media.h" |
| 80 #include "media/base/user_input_monitor.h" | 80 #include "media/base/user_input_monitor.h" |
| 81 #include "media/midi/midi_manager.h" | 81 #include "media/midi/midi_manager.h" |
| 82 #include "mojo/edk/embedder/embedder.h" | 82 #include "mojo/edk/embedder/embedder.h" |
| 83 #include "mojo/shell/public/cpp/shell.h" | |
| 84 #include "net/base/network_change_notifier.h" | 83 #include "net/base/network_change_notifier.h" |
| 85 #include "net/socket/client_socket_factory.h" | 84 #include "net/socket/client_socket_factory.h" |
| 86 #include "net/ssl/ssl_config_service.h" | 85 #include "net/ssl/ssl_config_service.h" |
| 86 #include "services/shell/public/cpp/shell.h" |
| 87 #include "skia/ext/event_tracer_impl.h" | 87 #include "skia/ext/event_tracer_impl.h" |
| 88 #include "skia/ext/skia_memory_dump_provider.h" | 88 #include "skia/ext/skia_memory_dump_provider.h" |
| 89 #include "sql/sql_memory_dump_provider.h" | 89 #include "sql/sql_memory_dump_provider.h" |
| 90 #include "ui/base/clipboard/clipboard.h" | 90 #include "ui/base/clipboard/clipboard.h" |
| 91 | 91 |
| 92 #if defined(USE_AURA) || defined(OS_MACOSX) | 92 #if defined(USE_AURA) || defined(OS_MACOSX) |
| 93 #include "content/browser/compositor/image_transport_factory.h" | 93 #include "content/browser/compositor/image_transport_factory.h" |
| 94 #endif | 94 #endif |
| 95 | 95 |
| 96 #if defined(USE_AURA) | 96 #if defined(USE_AURA) |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 #include "ui/gfx/x/x11_connection.h" | 174 #include "ui/gfx/x/x11_connection.h" |
| 175 #include "ui/gfx/x/x11_switches.h" | 175 #include "ui/gfx/x/x11_switches.h" |
| 176 #include "ui/gfx/x/x11_types.h" | 176 #include "ui/gfx/x/x11_types.h" |
| 177 #endif | 177 #endif |
| 178 | 178 |
| 179 #if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL) | 179 #if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL) |
| 180 #include "crypto/nss_util.h" | 180 #include "crypto/nss_util.h" |
| 181 #endif | 181 #endif |
| 182 | 182 |
| 183 #if defined(MOJO_SHELL_CLIENT) | 183 #if defined(MOJO_SHELL_CLIENT) |
| 184 #include "mojo/shell/public/cpp/connector.h" | 184 #include "services/shell/public/cpp/connector.h" |
| 185 #include "ui/views/mus/window_manager_connection.h" | 185 #include "ui/views/mus/window_manager_connection.h" |
| 186 #endif | 186 #endif |
| 187 | 187 |
| 188 // One of the linux specific headers defines this as a macro. | 188 // One of the linux specific headers defines this as a macro. |
| 189 #ifdef DestroyAll | 189 #ifdef DestroyAll |
| 190 #undef DestroyAll | 190 #undef DestroyAll |
| 191 #endif | 191 #endif |
| 192 | 192 |
| 193 namespace content { | 193 namespace content { |
| 194 namespace { | 194 namespace { |
| (...skipping 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1451 DCHECK(is_tracing_startup_for_duration_); | 1451 DCHECK(is_tracing_startup_for_duration_); |
| 1452 | 1452 |
| 1453 is_tracing_startup_for_duration_ = false; | 1453 is_tracing_startup_for_duration_ = false; |
| 1454 TracingController::GetInstance()->StopTracing( | 1454 TracingController::GetInstance()->StopTracing( |
| 1455 TracingController::CreateFileSink( | 1455 TracingController::CreateFileSink( |
| 1456 startup_trace_file_, | 1456 startup_trace_file_, |
| 1457 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1457 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
| 1458 } | 1458 } |
| 1459 | 1459 |
| 1460 } // namespace content | 1460 } // namespace content |
| OLD | NEW |