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

Side by Side Diff: android_webview/java/src/org/chromium/android_webview/AwContents.java

Issue 570783002: Fix but that ignored startRenderer in WebContentsImpl.java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove startRenderer Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.android_webview; 5 package org.chromium.android_webview;
6 6
7 import android.annotation.SuppressLint; 7 import android.annotation.SuppressLint;
8 import android.app.Activity; 8 import android.app.Activity;
9 import android.content.ComponentCallbacks2; 9 import android.content.ComponentCallbacks2;
10 import android.content.Context; 10 import android.content.Context;
(...skipping 1695 matching lines...) Expand 10 before | Expand all | Expand 10 after
1706 JavaScriptCallback jsCallback = null; 1706 JavaScriptCallback jsCallback = null;
1707 if (callback != null) { 1707 if (callback != null) {
1708 jsCallback = new JavaScriptCallback() { 1708 jsCallback = new JavaScriptCallback() {
1709 @Override 1709 @Override
1710 public void handleJavaScriptResult(String jsonResult) { 1710 public void handleJavaScriptResult(String jsonResult) {
1711 callback.onReceiveValue(jsonResult); 1711 callback.onReceiveValue(jsonResult);
1712 } 1712 }
1713 }; 1713 };
1714 } 1714 }
1715 1715
1716 mWebContents.evaluateJavaScript(script, jsCallback, false); 1716 mWebContents.evaluateJavaScript(script, jsCallback);
1717 } 1717 }
1718 1718
1719 /** 1719 // TODO(boliu): Remove this once Android side no longer calls this.
1720 * @see ContentViewCore.evaluateJavaScriptEvenIfNotYetNavigated(String)
1721 */
1722 public void evaluateJavaScriptEvenIfNotYetNavigated(String script) { 1720 public void evaluateJavaScriptEvenIfNotYetNavigated(String script) {
1723 mWebContents.evaluateJavaScript(script, null, true); 1721 mWebContents.evaluateJavaScript(script, null);
1724 } 1722 }
1725 1723
1726 //-------------------------------------------------------------------------- ------------------ 1724 //-------------------------------------------------------------------------- ------------------
1727 // View and ViewGroup method implementations 1725 // View and ViewGroup method implementations
1728 //-------------------------------------------------------------------------- ------------------ 1726 //-------------------------------------------------------------------------- ------------------
1729 1727
1730 /** 1728 /**
1731 * @see android.webkit.View#onTouchEvent() 1729 * @see android.webkit.View#onTouchEvent()
1732 */ 1730 */
1733 public boolean onTouchEvent(MotionEvent event) { 1731 public boolean onTouchEvent(MotionEvent event) {
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
2525 2523
2526 private native void nativeSetJsOnlineProperty(long nativeAwContents, boolean networkUp); 2524 private native void nativeSetJsOnlineProperty(long nativeAwContents, boolean networkUp);
2527 2525
2528 private native void nativeTrimMemory(long nativeAwContents, int level, boole an visible); 2526 private native void nativeTrimMemory(long nativeAwContents, int level, boole an visible);
2529 2527
2530 private native void nativeCreatePdfExporter(long nativeAwContents, AwPdfExpo rter awPdfExporter); 2528 private native void nativeCreatePdfExporter(long nativeAwContents, AwPdfExpo rter awPdfExporter);
2531 2529
2532 private native void nativePreauthorizePermission(long nativeAwContents, Stri ng origin, 2530 private native void nativePreauthorizePermission(long nativeAwContents, Stri ng origin,
2533 long resources); 2531 long resources);
2534 } 2532 }
OLDNEW
« no previous file with comments | « no previous file | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698