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

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

Issue 151343002: Web MIDI: make naming convention be consistent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | Annotate | Revision Log
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/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 { 459 {
460 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") 460 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures")
461 media::InitializeCPUSpecificMediaFeatures(); 461 media::InitializeCPUSpecificMediaFeatures();
462 } 462 }
463 { 463 {
464 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan") 464 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan")
465 audio_manager_.reset(media::AudioManager::Create( 465 audio_manager_.reset(media::AudioManager::Create(
466 MediaInternals::GetInstance())); 466 MediaInternals::GetInstance()));
467 } 467 }
468 { 468 {
469 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") 469 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MidiManager")
470 midi_manager_.reset(media::MIDIManager::Create()); 470 midi_manager_.reset(media::MidiManager::Create());
471 } 471 }
472 { 472 {
473 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") 473 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController")
474 WebUIControllerFactory::RegisterFactory( 474 WebUIControllerFactory::RegisterFactory(
475 ContentWebUIControllerFactory::GetInstance()); 475 ContentWebUIControllerFactory::GetInstance());
476 } 476 }
477 477
478 { 478 {
479 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager") 479 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager")
480 audio_mirroring_manager_.reset(new AudioMirroringManager()); 480 audio_mirroring_manager_.reset(new AudioMirroringManager());
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
1117 base::TimeDelta::FromSeconds(delay_secs)); 1117 base::TimeDelta::FromSeconds(delay_secs));
1118 } 1118 }
1119 1119
1120 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) { 1120 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) {
1121 is_tracing_startup_ = false; 1121 is_tracing_startup_ = false;
1122 TracingController::GetInstance()->DisableRecording( 1122 TracingController::GetInstance()->DisableRecording(
1123 trace_file, TracingController::TracingFileResultCallback()); 1123 trace_file, TracingController::TracingFileResultCallback());
1124 } 1124 }
1125 1125
1126 } // namespace content 1126 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698