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

Unified Diff: media/midi/midi_manager.cc

Issue 2404443002: Web MIDI: use midi_service.mojom for media::midi::Result (Closed)
Patch Set: rebase Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: media/midi/midi_manager.cc
diff --git a/media/midi/midi_manager.cc b/media/midi/midi_manager.cc
index ad9dfcebe908560b6bfb11605a382c058238ff12..a90dc1d944e3d97466570c8fd1a1926a20898e82 100644
--- a/media/midi/midi_manager.cc
+++ b/media/midi/midi_manager.cc
@@ -52,7 +52,9 @@ void ReportUsage(Usage usage) {
} // namespace
MidiManager::MidiManager()
- : initialized_(false), finalized_(false), result_(Result::NOT_INITIALIZED) {
+ : initialized_(false),
+ finalized_(false),
+ result_(mojom::Result::NOT_INITIALIZED) {
ReportUsage(Usage::CREATED);
}
@@ -74,7 +76,7 @@ MidiManager* MidiManager::Create() {
void MidiManager::Shutdown() {
UMA_HISTOGRAM_ENUMERATION("Media.Midi.ResultOnShutdown",
static_cast<int>(result_),
- static_cast<int>(Result::MAX) + 1);
+ static_cast<int>(mojom::Result::MAX) + 1);
base::AutoLock auto_lock(lock_);
if (session_thread_runner_) {
session_thread_runner_->PostTask(
@@ -90,7 +92,7 @@ void MidiManager::StartSession(MidiManagerClient* client) {
ReportUsage(Usage::SESSION_STARTED);
Completion completion = Completion::COMPLETE_SYNCHRONOUSLY;
- Result result = Result::NOT_INITIALIZED;
+ mojom::Result result = mojom::Result::NOT_INITIALIZED;
{
base::AutoLock auto_lock(lock_);
@@ -104,7 +106,7 @@ void MidiManager::StartSession(MidiManagerClient* client) {
if (initialized_) {
// Platform dependent initialization was already finished for previously
// initialized clients.
- if (result_ == Result::OK) {
+ if (result_ == mojom::Result::OK) {
AddInitialPorts(client);
clients_.insert(client);
}
@@ -116,7 +118,7 @@ void MidiManager::StartSession(MidiManagerClient* client) {
// Do not accept a new request if the pending client list contains too
// many clients, or Shutdown() was already called.
if (too_many_pending_clients_exist || finalized_) {
- result = Result::INITIALIZATION_ERROR;
+ result = mojom::Result::INITIALIZATION_ERROR;
} else {
// Call StartInitialization() only for the first request.
if (pending_clients_.empty()) {
@@ -173,10 +175,10 @@ void MidiManager::DispatchSendMidiData(MidiManagerClient* client,
}
void MidiManager::StartInitialization() {
- CompleteInitialization(Result::NOT_SUPPORTED);
+ CompleteInitialization(mojom::Result::NOT_SUPPORTED);
}
-void MidiManager::CompleteInitialization(Result result) {
+void MidiManager::CompleteInitialization(mojom::Result result) {
base::AutoLock auto_lock(lock_);
if (session_thread_runner_) {
session_thread_runner_->PostTask(
@@ -227,7 +229,7 @@ void MidiManager::ReceiveMidiData(uint32_t port_index,
client->ReceiveMidiData(port_index, data, length, timestamp);
}
-void MidiManager::CompleteInitializationInternal(Result result) {
+void MidiManager::CompleteInitializationInternal(mojom::Result result) {
TRACE_EVENT0("midi", "MidiManager::CompleteInitialization");
ReportUsage(Usage::INITIALIZED);
UMA_HISTOGRAM_ENUMERATION("Media.Midi.InputPorts",
@@ -244,7 +246,7 @@ void MidiManager::CompleteInitializationInternal(Result result) {
result_ = result;
for (auto* client : pending_clients_) {
- if (result_ == Result::OK) {
+ if (result_ == mojom::Result::OK) {
AddInitialPorts(client);
clients_.insert(client);
}

Powered by Google App Engine
This is Rietveld 408576698