| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 4f0bf8e06a13e0812c4e0735fdfa0a73d1440560..588330748e0cd3feb62722d35a18c4c68d895f6c 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -246,6 +246,12 @@
|
| #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
|
| #endif
|
|
|
| +#if defined(USE_AURA)
|
| +#include "services/shell/runner/common/client_util.h"
|
| +#include "services/ui/common/gpu_service.h"
|
| +#include "ui/views/mus/window_manager_connection.h"
|
| +#endif
|
| +
|
| #if defined(USE_ASH)
|
| #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
|
| #endif
|
| @@ -743,8 +749,7 @@ bool IsIntentPickerEnabled() {
|
| } // namespace
|
|
|
| ChromeContentBrowserClient::ChromeContentBrowserClient()
|
| - :
|
| - weak_factory_(this) {
|
| + : weak_factory_(this) {
|
| #if defined(ENABLE_PLUGINS)
|
| for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)
|
| allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]);
|
| @@ -2512,6 +2517,15 @@ content::BrowserPpapiHost*
|
| return NULL;
|
| }
|
|
|
| +gpu::GpuChannelEstablishFactory*
|
| +ChromeContentBrowserClient::GetGpuChannelEstablishFactory() {
|
| +#if defined(USE_AURA)
|
| + if (views::WindowManagerConnection::Exists())
|
| + return views::WindowManagerConnection::Get()->gpu_service();
|
| +#endif
|
| + return nullptr;
|
| +}
|
| +
|
| bool ChromeContentBrowserClient::AllowPepperSocketAPI(
|
| content::BrowserContext* browser_context,
|
| const GURL& url,
|
|
|