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 b05f8bb43e9cb0a5af59a5f50aca782e2e3a8900..fc89729fb01f1d6687df8947c59c16fe9cee7376 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" |
@@ -173,6 +172,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" |
@@ -2502,7 +2507,11 @@ bool ChromeContentBrowserClient::CheckMediaAccessPermission( |
content::DevToolsManagerDelegate* |
ChromeContentBrowserClient::GetDevToolsManagerDelegate() { |
+#if defined(OS_ANDROID) |
+ return new DevToolsManagerDelegateAndroid(); |
pfeldman
2014/09/18 11:45:58
nit: ChromeDevToolsManager vs DevToolsManagerDeleg
|
+#else |
return new ChromeDevToolsManagerDelegate(); |
+#endif |
} |
bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( |