| 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 e6556154ee1bca31f7a0adcc65a8c7172a3ae66b..e5c7911899899729a1c556497b2cde606df3637a 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -32,7 +32,6 @@
|
| #include "chrome/browser/content_settings/permission_request_id.h"
|
| #include "chrome/browser/content_settings/tab_specific_content_settings.h"
|
| #include "chrome/browser/defaults.h"
|
| -#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
|
| #include "chrome/browser/download/download_prefs.h"
|
| #include "chrome/browser/font_family_cache.h"
|
| #include "chrome/browser/geolocation/chrome_access_token_store.h"
|
| @@ -174,6 +173,12 @@
|
| #include "ui/gfx/android/device_display_info.h"
|
| #endif
|
|
|
| +#if defined(OS_ANDROID)
|
| +#include "chrome/browser/android/dev_tools_manager_delegate_android.h"
|
| +#else
|
| +#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
|
| +#endif
|
| +
|
| #if !defined(OS_CHROMEOS)
|
| #include "chrome/browser/signin/chrome_signin_client.h"
|
| #include "chrome/browser/signin/chrome_signin_client_factory.h"
|
| @@ -2504,7 +2509,11 @@ bool ChromeContentBrowserClient::CheckMediaAccessPermission(
|
|
|
| content::DevToolsManagerDelegate*
|
| ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
|
| +#if defined(OS_ANDROID)
|
| + return new DevToolsManagerDelegateAndroid();
|
| +#else
|
| return new ChromeDevToolsManagerDelegate();
|
| +#endif
|
| }
|
|
|
| bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
|
|
|