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

Unified Diff: chrome/browser/media/router/media_router_factory.cc

Issue 2294973002: Create MediaRouterActionController and MediaRouterUIService (Closed)
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/router/media_router_factory.cc
diff --git a/chrome/browser/media/router/media_router_factory.cc b/chrome/browser/media/router/media_router_factory.cc
index 64ba1cae327381180dc5f9ccbafbbd406adebed3..a8be58409d90aca24b8a8cfca8d86d2cccf58558 100644
--- a/chrome/browser/media/router/media_router_factory.cc
+++ b/chrome/browser/media/router/media_router_factory.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/media/android/router/media_router_android.h"
#else
#include "chrome/browser/media/router/mojo/media_router_mojo_impl.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h"
#include "extensions/browser/process_manager.h"
#include "extensions/browser/process_manager_factory.h"
#endif
@@ -56,6 +57,9 @@ MediaRouterFactory::MediaRouterFactory()
#if !defined(OS_ANDROID)
// On desktop platforms, MediaRouter depends on ProcessManager.
DependsOn(extensions::ProcessManagerFactory::GetInstance());
+ // On desktop platforms, MediaRouter owns a MediaRouterActionController
+ // that depends on ToolbarActionsModel.
+ DependsOn(ToolbarActionsModelFactory::GetInstance());
#endif
}
@@ -78,8 +82,8 @@ KeyedService* MediaRouterFactory::BuildServiceInstanceFor(
#if defined(OS_ANDROID)
media_router = new MediaRouterAndroid(context);
#else
- media_router =
- new MediaRouterMojoImpl(extensions::ProcessManager::Get(context));
+ media_router = new MediaRouterMojoImpl(
+ context, extensions::ProcessManager::Get(context));
#endif
media_router->Initialize();
return media_router;

Powered by Google App Engine
This is Rietveld 408576698