Chromium Code Reviews| Index: chrome/browser/media/router/media_router_factory.cc |
| diff --git a/chrome/browser/media/router/media_router_mojo_impl_factory.cc b/chrome/browser/media/router/media_router_factory.cc |
| similarity index 62% |
| rename from chrome/browser/media/router/media_router_mojo_impl_factory.cc |
| rename to chrome/browser/media/router/media_router_factory.cc |
| index 1e2c73552bf77fa973bf8bbf8bb590331233e5ef..5784cfbdf2c8e06bbebdd1f2ce380333e1ce51b6 100644 |
| --- a/chrome/browser/media/router/media_router_mojo_impl_factory.cc |
| +++ b/chrome/browser/media/router/media_router_factory.cc |
| @@ -2,12 +2,15 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "chrome/browser/media/router/media_router_mojo_impl_factory.h" |
| +#include "chrome/browser/media/router/media_router_factory.h" |
| -#include "chrome/browser/media/router/media_router_mojo_impl.h" |
| #include "components/keyed_service/content/browser_context_dependency_manager.h" |
| +#if defined(OS_ANDROID) |
| +#else |
| +#include "chrome/browser/media/router/media_router_mojo_impl.h" |
| #include "extensions/browser/process_manager.h" |
| #include "extensions/browser/process_manager_factory.h" |
| +#endif |
| using content::BrowserContext; |
| @@ -15,40 +18,51 @@ namespace media_router { |
| namespace { |
| -base::LazyInstance<MediaRouterMojoImplFactory> service_factory = |
| +#if !defined(OS_ANDROID) |
| +base::LazyInstance<MediaRouterFactory> service_factory = |
| LAZY_INSTANCE_INITIALIZER; |
| +#endif |
| } // namespace |
| // static |
| -MediaRouterMojoImpl* MediaRouterMojoImplFactory::GetApiForBrowserContext( |
| +MediaRouter* MediaRouterFactory::GetApiForBrowserContext( |
| BrowserContext* context) { |
| DCHECK(context); |
| - |
| +#if defined(OS_ANDROID) |
| + return nullptr; |
| +#else |
| return static_cast<MediaRouterMojoImpl*>( |
|
imcheng
2015/07/13 22:04:14
Is the static_cast still needed?
whywhat
2015/07/15 12:41:04
Don't think so. Removed.
|
| service_factory.Get().GetServiceForBrowserContext(context, true)); |
| +#endif |
| } |
| -MediaRouterMojoImplFactory::MediaRouterMojoImplFactory() |
| +MediaRouterFactory::MediaRouterFactory() |
| : BrowserContextKeyedServiceFactory( |
| - "MediaRouterMojoImpl", |
| + "MediaRouter", |
| BrowserContextDependencyManager::GetInstance()) { |
| - // MediaRouterMojoImpl depends on ProcessManager. |
| +#if !defined(OS_ANDROID) |
| + // MediaRouter depends on ProcessManager. |
|
imcheng
2015/07/13 22:04:14
Maybe clarify that this is true for desktop versio
whywhat
2015/07/15 12:41:04
Done.
|
| DependsOn(extensions::ProcessManagerFactory::GetInstance()); |
| +#endif |
| } |
| -MediaRouterMojoImplFactory::~MediaRouterMojoImplFactory() { |
| +MediaRouterFactory::~MediaRouterFactory() { |
| } |
| -KeyedService* MediaRouterMojoImplFactory::BuildServiceInstanceFor( |
| +KeyedService* MediaRouterFactory::BuildServiceInstanceFor( |
| BrowserContext* context) const { |
| +#if defined(OS_ANDROID) |
| + return nullptr; |
| +#else |
| return new MediaRouterMojoImpl(extensions::ProcessManager::Get(context)); |
| +#endif |
| } |
| -BrowserContext* MediaRouterMojoImplFactory::GetBrowserContextToUse( |
| +BrowserContext* MediaRouterFactory::GetBrowserContextToUse( |
| BrowserContext* context) const { |
| // Always use the input context. This means that an incognito context will |
| - // have its own MediaRouterMojoImpl service, rather than sharing it with its |
| + // have its own MediaRouter service, rather than sharing it with its |
| // original non-incognito context. |
| return context; |
| } |