Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2162)

Unified Diff: android_webview/browser/aw_devtools_delegate.cc

Issue 16796002: Delete the browser-compositor webview render mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/android_webview.gyp ('k') | android_webview/browser/browser_view_renderer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/aw_devtools_delegate.cc
diff --git a/android_webview/browser/aw_devtools_delegate.cc b/android_webview/browser/aw_devtools_delegate.cc
index 4718f47b1b054caffae8e93b1691666abbc8bafc..49a5ff443ab75982c3ef855313bd39e2ac745144 100644
--- a/android_webview/browser/aw_devtools_delegate.cc
+++ b/android_webview/browser/aw_devtools_delegate.cc
@@ -4,11 +4,8 @@
#include "android_webview/browser/aw_devtools_delegate.h"
-#include "android_webview/browser/browser_view_renderer_impl.h"
#include "android_webview/browser/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/strings/stringprintf.h"
#include "base/values.h"
@@ -218,14 +215,8 @@ std::string AwDevToolsDelegate::GetViewDescription(
content::WebContents::FromRenderViewHost(rvh);
if (!web_contents) return "";
- BrowserViewRenderer* bvr = NULL;
-
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kNoMergeUIAndRendererCompositorThreads)) {
- bvr = BrowserViewRendererImpl::FromWebContents(web_contents);
- } else {
- bvr = InProcessViewRenderer::FromWebContents(web_contents);
- }
+ BrowserViewRenderer* bvr
+ = InProcessViewRenderer::FromWebContents(web_contents);
if (!bvr) return "";
base::DictionaryValue description;
description.SetBoolean("attached", bvr->IsAttachedToWindow());
« no previous file with comments | « android_webview/android_webview.gyp ('k') | android_webview/browser/browser_view_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698