android_webview/browser/aw_browser_main_parts.cc - Issue 1258593002: Reland "Add ExecuteJavaScriptForTest and make all tests use it"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/browser/aw_browser_main_parts.cc

Issue 1258593002: Reland "Add ExecuteJavaScriptForTest and make all tests use it" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 5 years, 5 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 | « no previous file | android_webview/java/src/org/chromium/android_webview/AwContents.java » ('j') | content/browser/frame_host/render_frame_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/browser/aw_browser_main_parts.cc

diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc

index 85fa1ea28c0b899fd84dcbfbe6980aece1830a01..4c28f1430ff94100d91522f069b6607b163bd930 100644

--- a/android_webview/browser/aw_browser_main_parts.cc

+++ b/android_webview/browser/aw_browser_main_parts.cc

@@ -19,6 +19,7 @@

#include "base/files/file_path.h"

#include "base/path_service.h"

#include "content/public/browser/android/synchronous_compositor.h"

+#include "content/public/browser/render_frame_host.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/common/content_client.h"

#include "content/public/common/content_switches.h"

@@ -118,6 +119,8 @@ void AwBrowserMainParts::PreMainMessageLoopRun() {

gfx::GLSurface::InitializeOneOff();

}

+ content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView();

// This is needed for WebView Classic backwards compatibility

// See crbug.com/298495

content::SetMaxURLChars(20 * 1024 * 1024);