| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "chrome/browser/android/blimp/blimp_client_context_factory.h" | 5 #include "chrome/browser/android/blimp/blimp_client_context_factory.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
| 7 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
| 8 #include "base/supports_user_data.h" | 9 #include "base/supports_user_data.h" |
| 9 #include "blimp/client/public/blimp_client_context.h" | 10 #include "blimp/client/public/blimp_client_context.h" |
| 10 #include "blimp/client/public/compositor/compositor_dependencies.h" | 11 #include "blimp/client/public/compositor/compositor_dependencies.h" |
| 11 #include "chrome/browser/android/blimp/chrome_compositor_dependencies.h" | 12 #include "chrome/browser/android/blimp/chrome_compositor_dependencies.h" |
| 12 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 13 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 14 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
| 14 #include "content/public/browser/browser_context.h" | 15 #include "content/public/browser/browser_context.h" |
| 15 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
| 16 #include "ui/android/context_provider_factory.h" | 17 #include "ui/android/context_provider_factory.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 45 content::BrowserThread::FILE), | 46 content::BrowserThread::FILE), |
| 46 base::MakeUnique<ChromeCompositorDependencies>( | 47 base::MakeUnique<ChromeCompositorDependencies>( |
| 47 ui::ContextProviderFactory::GetInstance()), | 48 ui::ContextProviderFactory::GetInstance()), |
| 48 Profile::FromBrowserContext(context)->GetPrefs()); | 49 Profile::FromBrowserContext(context)->GetPrefs()); |
| 49 } | 50 } |
| 50 | 51 |
| 51 content::BrowserContext* BlimpClientContextFactory::GetBrowserContextToUse( | 52 content::BrowserContext* BlimpClientContextFactory::GetBrowserContextToUse( |
| 52 content::BrowserContext* context) const { | 53 content::BrowserContext* context) const { |
| 53 return context; | 54 return context; |
| 54 } | 55 } |
| OLD | NEW |