[Android WebView] Hook up devtools in merged threads mode.

R=boliu@chromium.org, mnaganov@chromium.org

Review URL: https://codereview.chromium.org/15583002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201530 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 2 deletions

diff --git a/android_webview/browser/aw_devtools_delegate.cc b/android_webview/browser/aw_devtools_delegate.cc
index 833a2fe..79ab0e2 100644
--- a/android_webview/browser/aw_devtools_delegate.cc
+++ b/android_webview/browser/aw_devtools_delegate.cc
@@ -5,7 +5,10 @@
 #include "android_webview/browser/aw_devtools_delegate.h"
 
 #include "android_webview/browser/browser_view_renderer_impl.h"
+#include "android_webview/browser/in_process_renderer/in_process_view_renderer.h"
+#include "android_webview/common/aw_switches.h"
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
@@ -213,8 +216,15 @@ std::string AwDevToolsDelegate::GetViewDescription(
   content::WebContents* web_contents =
       content::WebContents::FromRenderViewHost(rvh);
   if (!web_contents) return "";
-  BrowserViewRenderer* bvr =
-      BrowserViewRendererImpl::FromWebContents(web_contents);
+
+  BrowserViewRenderer* bvr = NULL;
+
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kNoMergeUIAndRendererCompositorThreads)) {
+    bvr = BrowserViewRendererImpl::FromWebContents(web_contents);
+  } else {
+    bvr = InProcessViewRenderer::FromWebContents(web_contents);
+  }
   if (!bvr) return "";
   base::DictionaryValue description;
   description.SetBoolean("attached", bvr->IsAttachedToWindow());