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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 #include "media/audio/audio_manager.h" | 56 #include "media/audio/audio_manager.h" |
57 #include "media/base/media.h" | 57 #include "media/base/media.h" |
58 #include "media/base/user_input_monitor.h" | 58 #include "media/base/user_input_monitor.h" |
59 #include "media/midi/midi_manager.h" | 59 #include "media/midi/midi_manager.h" |
60 #include "net/base/network_change_notifier.h" | 60 #include "net/base/network_change_notifier.h" |
61 #include "net/socket/client_socket_factory.h" | 61 #include "net/socket/client_socket_factory.h" |
62 #include "net/ssl/ssl_config_service.h" | 62 #include "net/ssl/ssl_config_service.h" |
63 #include "ui/base/clipboard/clipboard.h" | 63 #include "ui/base/clipboard/clipboard.h" |
64 | 64 |
65 #if defined(USE_AURA) | 65 #if defined(USE_AURA) |
66 #include "content/browser/aura/image_transport_factory.h" | 66 #include "content/browser/compositor/image_transport_factory.h" |
67 #endif | 67 #endif |
68 | 68 |
69 #if defined(OS_ANDROID) | 69 #if defined(OS_ANDROID) |
70 #include "base/android/jni_android.h" | 70 #include "base/android/jni_android.h" |
71 #include "content/browser/android/browser_startup_controller.h" | 71 #include "content/browser/android/browser_startup_controller.h" |
72 #include "content/browser/android/surface_texture_peer_browser_impl.h" | 72 #include "content/browser/android/surface_texture_peer_browser_impl.h" |
73 #endif | 73 #endif |
74 | 74 |
75 #if defined(OS_MACOSX) | 75 #if defined(OS_MACOSX) |
76 #include "content/browser/theme_helper_mac.h" | 76 #include "content/browser/theme_helper_mac.h" |
(...skipping 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1112 base::TimeDelta::FromSeconds(delay_secs)); | 1112 base::TimeDelta::FromSeconds(delay_secs)); |
1113 } | 1113 } |
1114 | 1114 |
1115 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) { | 1115 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) { |
1116 is_tracing_startup_ = false; | 1116 is_tracing_startup_ = false; |
1117 TracingController::GetInstance()->DisableRecording( | 1117 TracingController::GetInstance()->DisableRecording( |
1118 trace_file, TracingController::TracingFileResultCallback()); | 1118 trace_file, TracingController::TracingFileResultCallback()); |
1119 } | 1119 } |
1120 | 1120 |
1121 } // namespace content | 1121 } // namespace content |
OLD | NEW |