summaryrefslogtreecommitdiffstats
path: root/content/browser/transition_browsertest.cc
diff options
context:
space:
mode:
authorzhenw <zhenw@chromium.org>2014-10-20 11:50:26 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-20 18:50:45 +0000
commit70986bd4cc0712a132247adcd17ad5fca9cb9bd8 (patch)
tree935c63509faa58f7843fb41076f529e681477d3d /content/browser/transition_browsertest.cc
parent91448dd9f5b184282a64d737680de639b725b7c5 (diff)
downloadchromium_src-70986bd4cc0712a132247adcd17ad5fca9cb9bd8.zip
chromium_src-70986bd4cc0712a132247adcd17ad5fca9cb9bd8.tar.gz
chromium_src-70986bd4cc0712a132247adcd17ad5fca9cb9bd8.tar.bz2
Navigation transitions (web to native app): Get names and rects of transition elements (Chrome side)
Web to native app navigation transition uses Activity Transitions APIs in Android L. It requires the names and rects of transition elements. This CL gets the names and rects and pass them to TransitionRequestManager. This is the Chrome side of the CL. Blink side will be done after this CL is landed. https://codereview.chromium.org/654953002/ Design doc: https://docs.google.com/a/chromium.org/document/d/17jg1RRL3RI969cLwbKBIcoGDsPwqaEdBxafGNYGwiY4/edit# Demo video: https://drive.google.com/a/google.com/file/d/0B3hetueIc91Gd01DU25uT2hWU2M/view?usp=sharing Activity Transitions in Android L: https://developer.android.com/preview/material/animations.html#transitions BUG=370696 Review URL: https://codereview.chromium.org/652283002 Cr-Commit-Position: refs/heads/master@{#300304}
Diffstat (limited to 'content/browser/transition_browsertest.cc')
-rw-r--r--content/browser/transition_browsertest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/transition_browsertest.cc b/content/browser/transition_browsertest.cc
index 2452dd6..6d199a8 100644
--- a/content/browser/transition_browsertest.cc
+++ b/content/browser/transition_browsertest.cc
@@ -64,8 +64,9 @@ class TransitionBrowserTestObserver
ResourceRequestInfoImpl::ForRequest(request_);
if (is_transition_request_) {
- TransitionRequestManager::GetInstance()->AddPendingTransitionRequestData(
- info->GetChildID(), info->GetRenderFrameID(), "*", "", "");
+ TransitionRequestManager::GetInstance(
+ )->AddPendingTransitionRequestDataForTesting(
+ info->GetChildID(), info->GetRenderFrameID());
}
}