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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/content/browser/browser_main_loop.cc

Issue 17176031: Revert 207992: This looks like a reland of r207983, which was reverted in (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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
« no previous file with comments | « trunk/src/content/browser/browser_main_loop.h ('k') | trunk/src/content/browser/renderer_host/media/midi_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/browser/browser_main_loop.cc
===================================================================
--- trunk/src/content/browser/browser_main_loop.cc (revision 207994)
+++ trunk/src/content/browser/browser_main_loop.cc (working copy)
@@ -47,7 +47,6 @@
#include "crypto/nss_util.h"
#include "media/audio/audio_manager.h"
#include "media/base/media.h"
-#include "media/midi/midi_manager.h"
#include "net/base/network_change_notifier.h"
#include "net/socket/client_socket_factory.h"
#include "net/ssl/ssl_config_service.h"
@@ -401,11 +400,8 @@
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan")
audio_manager_.reset(media::AudioManager::Create());
}
- {
- TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager")
- midi_manager_.reset(media::MIDIManager::Create());
- }
+
#if !defined(OS_IOS)
{
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController")
« no previous file with comments | « trunk/src/content/browser/browser_main_loop.h ('k') | trunk/src/content/browser/renderer_host/media/midi_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698