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

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

Issue 2646093002: Move //content/browser/device_sensor/ into device/sensors (Closed)
Patch Set: gn format & code rebase Created 3 years, 10 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/android/browser_jni_registrar.cc ('k') | content/browser/device_sensors/DEPS » ('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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "base/trace_event/memory_dump_manager.h" 45 #include "base/trace_event/memory_dump_manager.h"
46 #include "base/trace_event/trace_event.h" 46 #include "base/trace_event/trace_event.h"
47 #include "build/build_config.h" 47 #include "build/build_config.h"
48 #include "components/discardable_memory/service/discardable_shared_memory_manage r.h" 48 #include "components/discardable_memory/service/discardable_shared_memory_manage r.h"
49 #include "components/tracing/browser/trace_config_file.h" 49 #include "components/tracing/browser/trace_config_file.h"
50 #include "components/tracing/common/process_metrics_memory_dump_provider.h" 50 #include "components/tracing/common/process_metrics_memory_dump_provider.h"
51 #include "components/tracing/common/trace_to_console.h" 51 #include "components/tracing/common/trace_to_console.h"
52 #include "components/tracing/common/tracing_switches.h" 52 #include "components/tracing/common/tracing_switches.h"
53 #include "content/browser/audio_manager_thread.h" 53 #include "content/browser/audio_manager_thread.h"
54 #include "content/browser/browser_thread_impl.h" 54 #include "content/browser/browser_thread_impl.h"
55 #include "content/browser/device_sensors/device_sensor_service.h"
56 #include "content/browser/dom_storage/dom_storage_area.h" 55 #include "content/browser/dom_storage/dom_storage_area.h"
57 #include "content/browser/download/download_resource_handler.h" 56 #include "content/browser/download/download_resource_handler.h"
58 #include "content/browser/download/save_file_manager.h" 57 #include "content/browser/download/save_file_manager.h"
59 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" 58 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
60 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" 59 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
61 #include "content/browser/gpu/compositor_util.h" 60 #include "content/browser/gpu/compositor_util.h"
62 #include "content/browser/gpu/gpu_data_manager_impl.h" 61 #include "content/browser/gpu/gpu_data_manager_impl.h"
63 #include "content/browser/gpu/gpu_process_host.h" 62 #include "content/browser/gpu/gpu_process_host.h"
64 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 63 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
65 #include "content/browser/gpu/shader_cache_factory.h" 64 #include "content/browser/gpu/shader_cache_factory.h"
(...skipping 19 matching lines...) Expand all
85 #include "content/public/browser/gpu_data_manager_observer.h" 84 #include "content/public/browser/gpu_data_manager_observer.h"
86 #include "content/public/browser/render_process_host.h" 85 #include "content/public/browser/render_process_host.h"
87 #include "content/public/browser/tracing_controller.h" 86 #include "content/public/browser/tracing_controller.h"
88 #include "content/public/common/content_client.h" 87 #include "content/public/common/content_client.h"
89 #include "content/public/common/content_features.h" 88 #include "content/public/common/content_features.h"
90 #include "content/public/common/content_switches.h" 89 #include "content/public/common/content_switches.h"
91 #include "content/public/common/main_function_params.h" 90 #include "content/public/common/main_function_params.h"
92 #include "content/public/common/result_codes.h" 91 #include "content/public/common/result_codes.h"
93 #include "device/battery/battery_status_service.h" 92 #include "device/battery/battery_status_service.h"
94 #include "device/gamepad/gamepad_service.h" 93 #include "device/gamepad/gamepad_service.h"
94 #include "device/sensors/device_sensor_service.h"
95 #include "media/base/media.h" 95 #include "media/base/media.h"
96 #include "media/base/user_input_monitor.h" 96 #include "media/base/user_input_monitor.h"
97 #include "media/midi/midi_service.h" 97 #include "media/midi/midi_service.h"
98 #include "mojo/edk/embedder/embedder.h" 98 #include "mojo/edk/embedder/embedder.h"
99 #include "mojo/edk/embedder/scoped_ipc_support.h" 99 #include "mojo/edk/embedder/scoped_ipc_support.h"
100 #include "net/base/network_change_notifier.h" 100 #include "net/base/network_change_notifier.h"
101 #include "net/socket/client_socket_factory.h" 101 #include "net/socket/client_socket_factory.h"
102 #include "net/ssl/ssl_config_service.h" 102 #include "net/ssl/ssl_config_service.h"
103 #include "ppapi/features/features.h" 103 #include "ppapi/features/features.h"
104 #include "services/service_manager/runner/common/client_util.h" 104 #include "services/service_manager/runner/common/client_util.h"
(...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after
1365 } 1365 }
1366 1366
1367 // Must happen after the I/O thread is shutdown since this class lives on the 1367 // Must happen after the I/O thread is shutdown since this class lives on the
1368 // I/O thread and isn't threadsafe. 1368 // I/O thread and isn't threadsafe.
1369 { 1369 {
1370 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:GamepadService"); 1370 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:GamepadService");
1371 device::GamepadService::GetInstance()->Terminate(); 1371 device::GamepadService::GetInstance()->Terminate();
1372 } 1372 }
1373 { 1373 {
1374 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:SensorService"); 1374 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:SensorService");
1375 DeviceSensorService::GetInstance()->Shutdown(); 1375 device::DeviceSensorService::GetInstance()->Shutdown();
1376 } 1376 }
1377 #if !defined(OS_ANDROID) 1377 #if !defined(OS_ANDROID)
1378 { 1378 {
1379 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:BatteryStatusService"); 1379 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:BatteryStatusService");
1380 device::BatteryStatusService::GetInstance()->Shutdown(); 1380 device::BatteryStatusService::GetInstance()->Shutdown();
1381 } 1381 }
1382 #endif 1382 #endif
1383 { 1383 {
1384 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:DeleteDataSources"); 1384 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:DeleteDataSources");
1385 URLDataManager::DeleteDataSources(); 1385 URLDataManager::DeleteDataSources();
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
1793 if (!audio_manager_) { 1793 if (!audio_manager_) {
1794 audio_thread_ = base::MakeUnique<AudioManagerThread>(); 1794 audio_thread_ = base::MakeUnique<AudioManagerThread>();
1795 audio_manager_ = media::AudioManager::Create( 1795 audio_manager_ = media::AudioManager::Create(
1796 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), 1796 audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
1797 MediaInternals::GetInstance()); 1797 MediaInternals::GetInstance());
1798 } 1798 }
1799 CHECK(audio_manager_); 1799 CHECK(audio_manager_);
1800 } 1800 }
1801 1801
1802 } // namespace content 1802 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/browser_jni_registrar.cc ('k') | content/browser/device_sensors/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698