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

Side by Side Diff: content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

Issue 689123003: Revert of Navigation transitions (web to native app): Pass data after starting provisional load ... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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.content.browser.webcontents; 5 package org.chromium.content.browser.webcontents;
6 6
7 import org.chromium.base.CalledByNative; 7 import org.chromium.base.CalledByNative;
8 import org.chromium.base.JNINamespace; 8 import org.chromium.base.JNINamespace;
9 import org.chromium.content_public.browser.JavaScriptCallback; 9 import org.chromium.content_public.browser.JavaScriptCallback;
10 import org.chromium.content_public.browser.NavigationController; 10 import org.chromium.content_public.browser.NavigationController;
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 } 221 }
222 222
223 @CalledByNative 223 @CalledByNative
224 private void addEnteringStylesheetToTransition(String stylesheet) { 224 private void addEnteringStylesheetToTransition(String stylesheet) {
225 if (mNavigationTransitionDelegate != null) { 225 if (mNavigationTransitionDelegate != null) {
226 mNavigationTransitionDelegate.addEnteringStylesheetToTransition(styl esheet); 226 mNavigationTransitionDelegate.addEnteringStylesheetToTransition(styl esheet);
227 } 227 }
228 } 228 }
229 229
230 @CalledByNative 230 @CalledByNative
231 private void didStartNavigationTransitionForFrame(long frameId, String cssSe lector) { 231 private void didStartNavigationTransitionForFrame(long frameId) {
232 if (mNavigationTransitionDelegate != null) { 232 if (mNavigationTransitionDelegate != null) {
233 mNavigationTransitionDelegate.didStartNavigationTransitionForFrame( 233 mNavigationTransitionDelegate.didStartNavigationTransitionForFrame(f rameId);
234 frameId, cssSelector);
235 } 234 }
236 } 235 }
237 236
238 @CalledByNative
239 private void addNavigationTransitionElements(String name, int x, int y, int width, int height) {
240 if (mNavigationTransitionDelegate != null) {
241 mNavigationTransitionDelegate.addNavigationTransitionElements(
242 name, x, y, width, height);
243 }
244 }
245
246 @Override 237 @Override
247 public void evaluateJavaScript(String script, JavaScriptCallback callback) { 238 public void evaluateJavaScript(String script, JavaScriptCallback callback) {
248 nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback); 239 nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback);
249 } 240 }
250 241
251 @CalledByNative 242 @CalledByNative
252 private static void onEvaluateJavaScriptResult( 243 private static void onEvaluateJavaScriptResult(
253 String jsonResult, JavaScriptCallback callback) { 244 String jsonResult, JavaScriptCallback callback) {
254 callback.handleJavaScriptResult(jsonResult); 245 callback.handleJavaScriptResult(jsonResult);
255 } 246 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 private native void nativeSetupTransitionView(long nativeWebContentsAndroid, 282 private native void nativeSetupTransitionView(long nativeWebContentsAndroid,
292 String markup); 283 String markup);
293 private native void nativeBeginExitTransition(long nativeWebContentsAndroid, 284 private native void nativeBeginExitTransition(long nativeWebContentsAndroid,
294 String cssSelector); 285 String cssSelector);
295 private native void nativeClearNavigationTransitionData(long nativeWebConten tsAndroid); 286 private native void nativeClearNavigationTransitionData(long nativeWebConten tsAndroid);
296 private native void nativeEvaluateJavaScript(long nativeWebContentsAndroid, 287 private native void nativeEvaluateJavaScript(long nativeWebContentsAndroid,
297 String script, JavaScriptCallback callback); 288 String script, JavaScriptCallback callback);
298 private native void nativePostMessageToFrame(long nativeWebContentsAndroid, String frameId, 289 private native void nativePostMessageToFrame(long nativeWebContentsAndroid, String frameId,
299 String message, String sourceOrigin, String targetOrigin); 290 String message, String sourceOrigin, String targetOrigin);
300 } 291 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698