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

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

Issue 2643713002: Port BatteryMonitor into Device Service (Closed)
Patch Set: Rebase Created 3 years, 9 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
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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 #include "content/public/browser/browser_main_parts.h" 83 #include "content/public/browser/browser_main_parts.h"
84 #include "content/public/browser/content_browser_client.h" 84 #include "content/public/browser/content_browser_client.h"
85 #include "content/public/browser/gpu_data_manager_observer.h" 85 #include "content/public/browser/gpu_data_manager_observer.h"
86 #include "content/public/browser/render_process_host.h" 86 #include "content/public/browser/render_process_host.h"
87 #include "content/public/browser/tracing_controller.h" 87 #include "content/public/browser/tracing_controller.h"
88 #include "content/public/common/content_client.h" 88 #include "content/public/common/content_client.h"
89 #include "content/public/common/content_features.h" 89 #include "content/public/common/content_features.h"
90 #include "content/public/common/content_switches.h" 90 #include "content/public/common/content_switches.h"
91 #include "content/public/common/main_function_params.h" 91 #include "content/public/common/main_function_params.h"
92 #include "content/public/common/result_codes.h" 92 #include "content/public/common/result_codes.h"
93 #include "device/battery/battery_status_service.h"
94 #include "device/gamepad/gamepad_service.h" 93 #include "device/gamepad/gamepad_service.h"
95 #include "gpu/vulkan/features.h" 94 #include "gpu/vulkan/features.h"
96 #include "media/audio/audio_system_impl.h" 95 #include "media/audio/audio_system_impl.h"
97 #include "media/base/media.h" 96 #include "media/base/media.h"
98 #include "media/base/user_input_monitor.h" 97 #include "media/base/user_input_monitor.h"
99 #include "media/midi/midi_service.h" 98 #include "media/midi/midi_service.h"
100 #include "mojo/edk/embedder/embedder.h" 99 #include "mojo/edk/embedder/embedder.h"
101 #include "mojo/edk/embedder/scoped_ipc_support.h" 100 #include "mojo/edk/embedder/scoped_ipc_support.h"
102 #include "net/base/network_change_notifier.h" 101 #include "net/base/network_change_notifier.h"
103 #include "net/socket/client_socket_factory.h" 102 #include "net/socket/client_socket_factory.h"
(...skipping 1265 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 BrowserGpuChannelHostFactory::Terminate(); 1368 BrowserGpuChannelHostFactory::Terminate();
1370 } 1369 }
1371 } 1370 }
1372 1371
1373 // Must happen after the I/O thread is shutdown since this class lives on the 1372 // Must happen after the I/O thread is shutdown since this class lives on the
1374 // I/O thread and isn't threadsafe. 1373 // I/O thread and isn't threadsafe.
1375 { 1374 {
1376 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:GamepadService"); 1375 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:GamepadService");
1377 device::GamepadService::GetInstance()->Terminate(); 1376 device::GamepadService::GetInstance()->Terminate();
1378 } 1377 }
1379 #if !defined(OS_ANDROID)
1380 {
1381 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:BatteryStatusService");
1382 device::BatteryStatusService::GetInstance()->Shutdown();
1383 }
1384 #endif
1385 { 1378 {
1386 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:DeleteDataSources"); 1379 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:DeleteDataSources");
1387 URLDataManager::DeleteDataSources(); 1380 URLDataManager::DeleteDataSources();
1388 } 1381 }
1389 1382
1390 if (parts_) { 1383 if (parts_) {
1391 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:PostDestroyThreads"); 1384 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:PostDestroyThreads");
1392 parts_->PostDestroyThreads(); 1385 parts_->PostDestroyThreads();
1393 } 1386 }
1394 } 1387 }
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
1783 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), 1776 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
1784 MediaInternals::GetInstance()); 1777 MediaInternals::GetInstance());
1785 } 1778 }
1786 CHECK(audio_manager_); 1779 CHECK(audio_manager_);
1787 1780
1788 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); 1781 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
1789 CHECK(audio_system_); 1782 CHECK(audio_system_);
1790 } 1783 }
1791 1784
1792 } // namespace content 1785 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698