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

Side by Side Diff: content/renderer/render_frame_impl.cc

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
« no previous file with comments | « content/public/common/transition_element.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2537 matching lines...) Expand 10 before | Expand all | Expand 10 after
2548 const blink::WebString& selector, 2548 const blink::WebString& selector,
2549 const blink::WebString& markup, 2549 const blink::WebString& markup,
2550 const blink::WebVector<blink::WebString>& web_names, 2550 const blink::WebVector<blink::WebString>& web_names,
2551 const blink::WebVector<blink::WebRect>& web_rects) { 2551 const blink::WebVector<blink::WebRect>& web_rects) {
2552 FrameHostMsg_AddNavigationTransitionData_Params params; 2552 FrameHostMsg_AddNavigationTransitionData_Params params;
2553 params.render_frame_id = routing_id_; 2553 params.render_frame_id = routing_id_;
2554 params.allowed_destination_host_pattern = 2554 params.allowed_destination_host_pattern =
2555 allowed_destination_host_pattern.utf8(); 2555 allowed_destination_host_pattern.utf8();
2556 params.selector = selector.utf8(); 2556 params.selector = selector.utf8();
2557 params.markup = markup.utf8(); 2557 params.markup = markup.utf8();
2558 params.elements.resize(web_names.size());
2559 for (size_t i = 0; i < web_names.size(); i++) { 2558 for (size_t i = 0; i < web_names.size(); i++) {
2560 params.elements[i].name = web_names[i].utf8(); 2559 params.names.push_back(web_names[i].utf8());
2561 params.elements[i].rect = gfx::Rect(web_rects[i]); 2560 }
2561 for (size_t i = 0; i < web_rects.size(); i++) {
2562 params.rects.push_back(gfx::Rect(web_rects[i]));
2562 } 2563 }
2563 2564
2564 Send(new FrameHostMsg_AddNavigationTransitionData(params)); 2565 Send(new FrameHostMsg_AddNavigationTransitionData(params));
2565 } 2566 }
2566 2567
2567 void RenderFrameImpl::didChangeThemeColor() { 2568 void RenderFrameImpl::didChangeThemeColor() {
2568 if (frame_->parent()) 2569 if (frame_->parent())
2569 return; 2570 return;
2570 2571
2571 Send(new FrameHostMsg_DidChangeThemeColor( 2572 Send(new FrameHostMsg_DidChangeThemeColor(
(...skipping 1574 matching lines...) Expand 10 before | Expand all | Expand 10 after
4146 4147
4147 #if defined(ENABLE_BROWSER_CDMS) 4148 #if defined(ENABLE_BROWSER_CDMS)
4148 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4149 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4149 if (!cdm_manager_) 4150 if (!cdm_manager_)
4150 cdm_manager_ = new RendererCdmManager(this); 4151 cdm_manager_ = new RendererCdmManager(this);
4151 return cdm_manager_; 4152 return cdm_manager_;
4152 } 4153 }
4153 #endif // defined(ENABLE_BROWSER_CDMS) 4154 #endif // defined(ENABLE_BROWSER_CDMS)
4154 4155
4155 } // namespace content 4156 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/transition_element.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698