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

Unified Diff: content/browser/browser_main_loop.cc

Issue 12089034: Add a WebUIControllerFactory in content and move chrome://webrtc-internals to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 7 years, 11 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 | « chrome/common/url_constants.cc ('k') | content/browser/media/resources/webrtc_internals.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
===================================================================
--- content/browser/browser_main_loop.cc (revision 179290)
+++ content/browser/browser_main_loop.cc (working copy)
@@ -31,6 +31,7 @@
#include "content/browser/renderer_host/media/media_stream_manager.h"
#include "content/browser/speech/speech_recognition_manager_impl.h"
#include "content/browser/trace_controller_impl.h"
+#include "content/browser/webui/content_web_ui_controller_factory.h"
#include "content/browser/webui/url_data_manager.h"
#include "content/public/browser/browser_main_parts.h"
#include "content/public/browser/browser_shutdown.h"
@@ -336,11 +337,13 @@
hi_res_timer_manager_.reset(new HighResolutionTimerManager);
network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
audio_manager_.reset(media::AudioManager::Create());
+
#if !defined(OS_IOS)
+ WebUIControllerFactory::RegisterFactory(
+ ContentWebUIControllerFactory::GetInstance());
+
audio_mirroring_manager_.reset(new AudioMirroringManager());
-#endif
-#if !defined(OS_IOS)
// Start tracing to a file if needed.
if (base::debug::TraceLog::GetInstance()->IsEnabled()) {
TraceControllerImpl::GetInstance()->InitStartupTracing(
« no previous file with comments | « chrome/common/url_constants.cc ('k') | content/browser/media/resources/webrtc_internals.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698