| 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 f1cb6e4e5b860f0a647792b6a247041580ffc256..b2cb43947a740cc52e8461a54760f7d30442dff9 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -33,6 +33,7 @@
|
| #include "chrome/browser/content_settings/cookie_settings.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"
|
| @@ -175,12 +176,6 @@
|
| #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(TOOLKIT_VIEWS)
|
| #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
|
| #endif
|
| @@ -2367,11 +2362,7 @@ void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric,
|
|
|
| content::DevToolsManagerDelegate*
|
| ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
|
| -#if defined(OS_ANDROID)
|
| - return new DevToolsManagerDelegateAndroid();
|
| -#else
|
| return new ChromeDevToolsManagerDelegate();
|
| -#endif
|
| }
|
|
|
| content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() {
|
|
|