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

Side by Side Diff: content/browser/transition_browsertest.cc

Issue 652283002: Navigation transitions (web to native app): Get names and rects of transition elements (Chrome side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use struct as IPC params Created 6 years, 2 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
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 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "content/browser/loader/cross_site_resource_handler.h" 7 #include "content/browser/loader/cross_site_resource_handler.h"
8 #include "content/browser/loader/resource_dispatcher_host_impl.h" 8 #include "content/browser/loader/resource_dispatcher_host_impl.h"
9 #include "content/browser/loader/resource_request_info_impl.h" 9 #include "content/browser/loader/resource_request_info_impl.h"
10 #include "content/browser/transition_request_manager.h" 10 #include "content/browser/transition_request_manager.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 resource_context, 57 resource_context,
58 appcache_service, 58 appcache_service,
59 resource_type, 59 resource_type,
60 throttles); 60 throttles);
61 request_ = request; 61 request_ = request;
62 62
63 ResourceRequestInfoImpl* info = 63 ResourceRequestInfoImpl* info =
64 ResourceRequestInfoImpl::ForRequest(request_); 64 ResourceRequestInfoImpl::ForRequest(request_);
65 65
66 if (is_transition_request_) { 66 if (is_transition_request_) {
67 TransitionRequestManager::GetInstance()->AddPendingTransitionRequestData( 67 TransitionRequestManager::GetInstance(
68 info->GetChildID(), info->GetRenderFrameID(), "*", "", ""); 68 )->AddPendingTransitionRequestDataForTesting(
69 info->GetChildID(), info->GetRenderFrameID());
69 } 70 }
70 } 71 }
71 72
72 virtual void OnResponseStarted( 73 virtual void OnResponseStarted(
73 net::URLRequest* request, 74 net::URLRequest* request,
74 ResourceContext* resource_context, 75 ResourceContext* resource_context,
75 ResourceResponse* response, 76 ResourceResponse* response,
76 IPC::Sender* sender) override { 77 IPC::Sender* sender) override {
77 ResourceRequestInfoImpl* info = 78 ResourceRequestInfoImpl* info =
78 ResourceRequestInfoImpl::ForRequest(request_); 79 ResourceRequestInfoImpl::ForRequest(request_);
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 152
152 WaitForLoadStop(transition_web_contents.get()); 153 WaitForLoadStop(transition_web_contents.get());
153 154
154 int transition_process_id = 155 int transition_process_id =
155 transition_web_contents->GetRenderProcessHost()->GetID(); 156 transition_web_contents->GetRenderProcessHost()->GetID();
156 157
157 EXPECT_EQ(outgoing_process_id, transition_process_id); 158 EXPECT_EQ(outgoing_process_id, transition_process_id);
158 } 159 }
159 160
160 } // namespace content 161 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698