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

Side by Side Diff: content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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; 5 package org.chromium.content.browser;
6 6
7 import android.test.suitebuilder.annotation.SmallTest; 7 import android.test.suitebuilder.annotation.SmallTest;
8 import android.text.TextUtils; 8 import android.text.TextUtils;
9 import android.util.Pair; 9 import android.util.Pair;
10 10
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 return mHandleDefer; 60 return mHandleDefer;
61 } 61 }
62 62
63 @Override 63 @Override
64 public void addEnteringStylesheetToTransition(String stylesheet) { 64 public void addEnteringStylesheetToTransition(String stylesheet) {
65 mDidCallAddStylesheet = true; 65 mDidCallAddStylesheet = true;
66 mTransitionStylesheets.add(stylesheet); 66 mTransitionStylesheets.add(stylesheet);
67 } 67 }
68 68
69 @Override 69 @Override
70 public void didStartNavigationTransitionForFrame(long frameId, String cs sSelector) { 70 public void didStartNavigationTransitionForFrame(long frameId) {
71 }
72
73 @Override
74 public void addNavigationTransitionElements(
75 String name, int x, int y, int width, int height) {
76 } 71 }
77 72
78 public boolean getDidCallDefer() { 73 public boolean getDidCallDefer() {
79 return mDidCallDefer; 74 return mDidCallDefer;
80 } 75 }
81 76
82 public boolean getDidCallWillHandlerDefer() { 77 public boolean getDidCallWillHandlerDefer() {
83 return mDidCallWillHandleDefer; 78 return mDidCallWillHandleDefer;
84 } 79 }
85 80
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 329
335 assertTrue("X-Transition-Entering-Color parsed correctly.", 330 assertTrue("X-Transition-Entering-Color parsed correctly.",
336 TextUtils.equals( 331 TextUtils.equals(
337 delegate.getTransitionEnteringColor(), 332 delegate.getTransitionEnteringColor(),
338 transitionEnteringColor)); 333 transitionEnteringColor));
339 } finally { 334 } finally {
340 webServer.shutdown(); 335 webServer.shutdown();
341 } 336 }
342 } 337 }
343 } 338 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698