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

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: review boliu #2 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 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 { 460 {
461 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") 461 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures")
462 media::InitializeCPUSpecificMediaFeatures(); 462 media::InitializeCPUSpecificMediaFeatures();
463 } 463 }
464 { 464 {
465 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan") 465 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan")
466 audio_manager_.reset(media::AudioManager::Create( 466 audio_manager_.reset(media::AudioManager::Create(
467 MediaInternals::GetInstance())); 467 MediaInternals::GetInstance()));
468 } 468 }
469 { 469 {
470 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") 470 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MidiManager")
471 midi_manager_.reset(media::MIDIManager::Create()); 471 midi_manager_.reset(media::MidiManager::Create());
472 } 472 }
473 { 473 {
474 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") 474 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController")
475 WebUIControllerFactory::RegisterFactory( 475 WebUIControllerFactory::RegisterFactory(
476 ContentWebUIControllerFactory::GetInstance()); 476 ContentWebUIControllerFactory::GetInstance());
477 } 477 }
478 478
479 { 479 {
480 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager") 480 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager")
481 audio_mirroring_manager_.reset(new AudioMirroringManager()); 481 audio_mirroring_manager_.reset(new AudioMirroringManager());
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 base::TimeDelta::FromSeconds(delay_secs)); 1118 base::TimeDelta::FromSeconds(delay_secs));
1119 } 1119 }
1120 1120
1121 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) { 1121 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) {
1122 is_tracing_startup_ = false; 1122 is_tracing_startup_ = false;
1123 TracingController::GetInstance()->DisableRecording( 1123 TracingController::GetInstance()->DisableRecording(
1124 trace_file, TracingController::TracingFileResultCallback()); 1124 trace_file, TracingController::TracingFileResultCallback());
1125 } 1125 }
1126 1126
1127 } // namespace content 1127 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/child_process_security_policy_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698