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

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

Issue 1276233005: [WebMIDI] Add "use-android-midi-api" flag for Android M+ devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 BrowserGpuMemoryBufferManager::current(), io_thread_->task_runner()); 1154 BrowserGpuMemoryBufferManager::current(), io_thread_->task_runner());
1155 1155
1156 { 1156 {
1157 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan"); 1157 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan");
1158 audio_manager_.reset(media::AudioManager::CreateWithHangTimer( 1158 audio_manager_.reset(media::AudioManager::CreateWithHangTimer(
1159 MediaInternals::GetInstance(), io_thread_->task_runner())); 1159 MediaInternals::GetInstance(), io_thread_->task_runner()));
1160 } 1160 }
1161 1161
1162 { 1162 {
1163 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager"); 1163 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager");
1164 midi_manager_.reset(media::midi::MidiManager::Create()); 1164 media::midi::MidiManager::CreationOptions options;
Takashi Toyoshima 2015/08/12 04:39:47 I prefer to use base::CommandLine::ForCurrentProce
yhirano 2015/08/12 05:37:05 Done.
1165 #if defined(OS_ANDROID)
1166 options.set_use_native_midi_api(
1167 parsed_command_line_.HasSwitch(switches::kUseAndroidMidiApi));
1168 #endif
1169 midi_manager_.reset(media::midi::MidiManager::Create(options));
1165 } 1170 }
1166 1171
1167 #if defined(OS_LINUX) && defined(USE_UDEV) 1172 #if defined(OS_LINUX) && defined(USE_UDEV)
1168 device_monitor_linux_.reset(new DeviceMonitorLinux()); 1173 device_monitor_linux_.reset(new DeviceMonitorLinux());
1169 #elif defined(OS_MACOSX) 1174 #elif defined(OS_MACOSX)
1170 device_monitor_mac_.reset(new DeviceMonitorMac()); 1175 device_monitor_mac_.reset(new DeviceMonitorMac());
1171 #endif 1176 #endif
1172 1177
1173 #if defined(OS_WIN) 1178 #if defined(OS_WIN)
1174 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", 1179 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown",
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 DCHECK(is_tracing_startup_); 1365 DCHECK(is_tracing_startup_);
1361 1366
1362 is_tracing_startup_ = false; 1367 is_tracing_startup_ = false;
1363 TracingController::GetInstance()->DisableRecording( 1368 TracingController::GetInstance()->DisableRecording(
1364 TracingController::CreateFileSink( 1369 TracingController::CreateFileSink(
1365 startup_trace_file_, 1370 startup_trace_file_,
1366 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1371 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1367 } 1372 }
1368 1373
1369 } // namespace content 1374 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698