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

Unified Diff: content/browser/transition_browsertest.cc

Issue 435833002: Navigation transitions: Plumb data from the outgoing renderer to the incoming renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Testfix Created 6 years, 4 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
Index: content/browser/transition_browsertest.cc
diff --git a/content/browser/transition_browsertest.cc b/content/browser/transition_browsertest.cc
index 927fbba5e7921cee2729479a810b1f47c21c4955..ff3203505a99589e5568d6a9426b7ccf66a818fe 100644
--- a/content/browser/transition_browsertest.cc
+++ b/content/browser/transition_browsertest.cc
@@ -3,12 +3,14 @@
// found in the LICENSE file.
#include "base/bind.h"
+#include "base/command_line.h"
#include "content/browser/loader/cross_site_resource_handler.h"
#include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/loader/resource_request_info_impl.h"
#include "content/browser/transition_request_manager.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/content_browser_test.h"
#include "content/public/test/content_browser_test_utils.h"
@@ -24,6 +26,11 @@ class TransitionBrowserTest : public ContentBrowserTest {
public:
TransitionBrowserTest() {}
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ command_line->AppendSwitch(
+ switches::kEnableExperimentalWebPlatformFeatures);
+ }
+
private:
DISALLOW_COPY_AND_ASSIGN(TransitionBrowserTest);
};
@@ -60,8 +67,10 @@ class TransitionBrowserTestObserver
ResourceRequestInfoImpl* info =
ResourceRequestInfoImpl::ForRequest(request_);
- TransitionRequestManager::GetInstance()->SetHasPendingTransitionRequest(
- child_id, info->GetRenderFrameID(), is_transition_request_);
+ if (is_transition_request_) {
+ TransitionRequestManager::GetInstance()->AddPendingTransitionRequestData(
+ child_id, info->GetRenderFrameID(), "*", "", "");
+ }
}
virtual void OnResponseStarted(
« no previous file with comments | « content/browser/renderer_host/render_message_filter.cc ('k') | content/browser/transition_request_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698