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

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

Issue 872473003: PlzNavigate: Remove the RequestNavigation IPC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nits + fix compilation error Created 5 years, 10 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
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/test/test_navigation_url_loader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2288 matching lines...) Expand 10 before | Expand all | Expand 10 after
2299 params.pending_history_list_offset, 2299 params.pending_history_list_offset,
2300 params.should_clear_history_list, 2300 params.should_clear_history_list,
2301 params.common_params.transition); 2301 params.common_params.transition);
2302 navigation_state->set_should_replace_current_entry( 2302 navigation_state->set_should_replace_current_entry(
2303 params.should_replace_current_entry); 2303 params.should_replace_current_entry);
2304 navigation_state->set_transferred_request_child_id( 2304 navigation_state->set_transferred_request_child_id(
2305 params.transferred_request_child_id); 2305 params.transferred_request_child_id);
2306 navigation_state->set_transferred_request_request_id( 2306 navigation_state->set_transferred_request_request_id(
2307 params.transferred_request_request_id); 2307 params.transferred_request_request_id);
2308 navigation_state->set_allow_download(params.common_params.allow_download); 2308 navigation_state->set_allow_download(params.common_params.allow_download);
2309 navigation_state->set_extra_headers(params.request_params.extra_headers); 2309 navigation_state->set_extra_headers(params.extra_headers);
2310 } else { 2310 } else {
2311 navigation_state = NavigationState::CreateContentInitiated(); 2311 navigation_state = NavigationState::CreateContentInitiated();
2312 } 2312 }
2313 return navigation_state; 2313 return navigation_state;
2314 } 2314 }
2315 2315
2316 void RenderViewImpl::didClearWindowObject(WebLocalFrame* frame) { 2316 void RenderViewImpl::didClearWindowObject(WebLocalFrame* frame) {
2317 FOR_EACH_OBSERVER( 2317 FOR_EACH_OBSERVER(
2318 RenderViewObserver, observers_, DidClearWindowObject(frame)); 2318 RenderViewObserver, observers_, DidClearWindowObject(frame));
2319 2319
(...skipping 1739 matching lines...) Expand 10 before | Expand all | Expand 10 after
4059 std::vector<gfx::Size> sizes; 4059 std::vector<gfx::Size> sizes;
4060 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4060 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4061 if (!url.isEmpty()) 4061 if (!url.isEmpty())
4062 urls.push_back( 4062 urls.push_back(
4063 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4063 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4064 } 4064 }
4065 SendUpdateFaviconURL(urls); 4065 SendUpdateFaviconURL(urls);
4066 } 4066 }
4067 4067
4068 } // namespace content 4068 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/test/test_navigation_url_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698