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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2566673002: Web MIDI: introduce MidiService class (Closed)
Patch Set: merge master Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/media/midi_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index ff0c374311c2279ce078822c87247e861508fd50..2d71994b3a67a4ef0fb5de486b1e762dc2c33734 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -93,7 +93,7 @@
#include "device/time_zone_monitor/time_zone_monitor.h"
#include "media/base/media.h"
#include "media/base/user_input_monitor.h"
-#include "media/midi/midi_manager.h"
+#include "media/midi/midi_service.h"
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/scoped_ipc_support.h"
#include "net/base/network_change_notifier.h"
@@ -1140,9 +1140,9 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
resource_dispatcher_host_->Shutdown();
}
// Request shutdown to clean up allocated resources on the IO thread.
- if (midi_manager_) {
- TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:MidiManager");
- midi_manager_->Shutdown();
+ if (midi_service_) {
+ TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:MidiService");
+ midi_service_->Shutdown();
}
memory_pressure_monitor_.reset();
@@ -1405,8 +1405,8 @@ int BrowserMainLoop::BrowserThreadsStarted() {
}
{
- TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager");
- midi_manager_.reset(midi::MidiManager::Create());
+ TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiService");
+ midi_service_.reset(new midi::MidiService);
}
#if defined(OS_WIN)
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/media/midi_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698