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

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

Issue 102563003: pushState should not be treated as a navigation (step 1 of 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_impl.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 (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 2394 matching lines...) Expand 10 before | Expand all | Expand 10 after
2405 routing_id_, 2405 routing_id_,
2406 id, 2406 id,
2407 base::FilePath::FromUTF16Unsafe(path))); 2407 base::FilePath::FromUTF16Unsafe(path)));
2408 } 2408 }
2409 2409
2410 void RenderViewImpl::initializeHelperPluginWebFrame( 2410 void RenderViewImpl::initializeHelperPluginWebFrame(
2411 blink::WebHelperPlugin* plugin) { 2411 blink::WebHelperPlugin* plugin) {
2412 plugin->initializeFrame(main_render_frame_.get()); 2412 plugin->initializeFrame(main_render_frame_.get());
2413 } 2413 }
2414 2414
2415 void RenderViewImpl::didStartLoading(bool to_different_document) {
2416 didStartLoading();
2417 }
2418
2415 void RenderViewImpl::didStartLoading() { 2419 void RenderViewImpl::didStartLoading() {
2416 if (is_loading_) { 2420 if (is_loading_) {
2417 DVLOG(1) << "didStartLoading called while loading"; 2421 DVLOG(1) << "didStartLoading called while loading";
2418 return; 2422 return;
2419 } 2423 }
2420 2424
2421 is_loading_ = true; 2425 is_loading_ = true;
2422 2426
2423 Send(new ViewHostMsg_DidStartLoading(routing_id_)); 2427 Send(new ViewHostMsg_DidStartLoading(routing_id_));
2424 2428
(...skipping 4023 matching lines...) Expand 10 before | Expand all | Expand 10 after
6448 for (size_t i = 0; i < icon_urls.size(); i++) { 6452 for (size_t i = 0; i < icon_urls.size(); i++) {
6449 WebURL url = icon_urls[i].iconURL(); 6453 WebURL url = icon_urls[i].iconURL();
6450 if (!url.isEmpty()) 6454 if (!url.isEmpty())
6451 urls.push_back(FaviconURL(url, 6455 urls.push_back(FaviconURL(url,
6452 ToFaviconType(icon_urls[i].iconType()))); 6456 ToFaviconType(icon_urls[i].iconType())));
6453 } 6457 }
6454 SendUpdateFaviconURL(urls); 6458 SendUpdateFaviconURL(urls);
6455 } 6459 }
6456 6460
6457 } // namespace content 6461 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698