Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 1960743002: Remove dependency of AsyncResourceLoader on content/browser/host_zoom_map_impl.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@devtoolsnetlog-loader
Patch Set: missed override Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/content_resource_dispatcher_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 24 matching lines...) Expand all
35 #include "base/threading/thread_restrictions.h" 35 #include "base/threading/thread_restrictions.h"
36 #include "base/timer/hi_res_timer_manager.h" 36 #include "base/timer/hi_res_timer_manager.h"
37 #include "base/trace_event/memory_dump_manager.h" 37 #include "base/trace_event/memory_dump_manager.h"
38 #include "base/trace_event/trace_event.h" 38 #include "base/trace_event/trace_event.h"
39 #include "build/build_config.h" 39 #include "build/build_config.h"
40 #include "components/tracing/process_metrics_memory_dump_provider.h" 40 #include "components/tracing/process_metrics_memory_dump_provider.h"
41 #include "components/tracing/trace_config_file.h" 41 #include "components/tracing/trace_config_file.h"
42 #include "components/tracing/trace_to_console.h" 42 #include "components/tracing/trace_to_console.h"
43 #include "components/tracing/tracing_switches.h" 43 #include "components/tracing/tracing_switches.h"
44 #include "content/browser/browser_thread_impl.h" 44 #include "content/browser/browser_thread_impl.h"
45 #include "content/browser/content_resource_dispatcher_host.h"
45 #include "content/browser/device_sensors/device_inertial_sensor_service.h" 46 #include "content/browser/device_sensors/device_inertial_sensor_service.h"
46 #include "content/browser/dom_storage/dom_storage_area.h" 47 #include "content/browser/dom_storage/dom_storage_area.h"
47 #include "content/browser/download/save_file_manager.h" 48 #include "content/browser/download/save_file_manager.h"
48 #include "content/browser/gamepad/gamepad_service.h" 49 #include "content/browser/gamepad/gamepad_service.h"
49 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" 50 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
50 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" 51 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
51 #include "content/browser/gpu/compositor_util.h" 52 #include "content/browser/gpu/compositor_util.h"
52 #include "content/browser/gpu/gpu_data_manager_impl.h" 53 #include "content/browser/gpu/gpu_data_manager_impl.h"
53 #include "content/browser/gpu/gpu_process_host.h" 54 #include "content/browser/gpu/gpu_process_host.h"
54 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 55 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
(...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 #endif 1300 #endif
1300 1301
1301 #if defined(OS_WIN) 1302 #if defined(OS_WIN)
1302 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", 1303 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown",
1303 IsWin32kRendererLockdownEnabled()); 1304 IsWin32kRendererLockdownEnabled());
1304 #endif 1305 #endif
1305 // RDH needs the IO thread to be created 1306 // RDH needs the IO thread to be created
1306 { 1307 {
1307 TRACE_EVENT0("startup", 1308 TRACE_EVENT0("startup",
1308 "BrowserMainLoop::BrowserThreadsStarted:InitResourceDispatcherHost"); 1309 "BrowserMainLoop::BrowserThreadsStarted:InitResourceDispatcherHost");
1310 content_resource_dispatcher_host_.reset(
1311 new ContentResourceDispatcherHost());
1309 resource_dispatcher_host_.reset(new ResourceDispatcherHostImpl()); 1312 resource_dispatcher_host_.reset(new ResourceDispatcherHostImpl());
1313 content_resource_dispatcher_host_->SetChild(
1314 resource_dispatcher_host_.get());
1315 resource_dispatcher_host_->Init();
1310 } 1316 }
1311 1317
1312 // MediaStreamManager needs the IO thread to be created. 1318 // MediaStreamManager needs the IO thread to be created.
1313 { 1319 {
1314 TRACE_EVENT0("startup", 1320 TRACE_EVENT0("startup",
1315 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager"); 1321 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager");
1316 media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get())); 1322 media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
1317 } 1323 }
1318 1324
1319 { 1325 {
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
1540 std::move(worker_task_runner), 1546 std::move(worker_task_runner),
1541 MediaInternals::GetInstance()); 1547 MediaInternals::GetInstance());
1542 } 1548 }
1543 CHECK(audio_manager_); 1549 CHECK(audio_manager_);
1544 1550
1545 if (use_hang_monitor) 1551 if (use_hang_monitor)
1546 media::AudioManager::StartHangMonitor(io_thread_->task_runner()); 1552 media::AudioManager::StartHangMonitor(io_thread_->task_runner());
1547 } 1553 }
1548 1554
1549 } // namespace content 1555 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/content_resource_dispatcher_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698