| OLD | NEW |
| 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/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 622 // user naivgates even if the renderer is delayed. There is also an issue | 622 // user naivgates even if the renderer is delayed. There is also an issue |
| 623 // with the throbber starting because the WebUI (which controls whether the | 623 // with the throbber starting because the WebUI (which controls whether the |
| 624 // favicon is displayed) happens synchronously. If the start loading | 624 // favicon is displayed) happens synchronously. If the start loading |
| 625 // messages was asynchronous, then the default favicon would flash in. | 625 // messages was asynchronous, then the default favicon would flash in. |
| 626 // | 626 // |
| 627 // WebKit doesn't send throb notifications for JavaScript URLs, so we | 627 // WebKit doesn't send throb notifications for JavaScript URLs, so we |
| 628 // don't want to either. | 628 // don't want to either. |
| 629 if (!params.url.SchemeIs(kJavaScriptScheme)) { | 629 if (!params.url.SchemeIs(kJavaScriptScheme)) { |
| 630 RenderFrameHostImpl* rfh = | 630 RenderFrameHostImpl* rfh = |
| 631 static_cast<RenderFrameHostImpl*>(GetMainFrame()); | 631 static_cast<RenderFrameHostImpl*>(GetMainFrame()); |
| 632 rfh->OnDidStartLoading(); | 632 rfh->OnDidStartLoading(true); |
| 633 } | 633 } |
| 634 } | 634 } |
| 635 | 635 |
| 636 void RenderViewHostImpl::NavigateToURL(const GURL& url) { | 636 void RenderViewHostImpl::NavigateToURL(const GURL& url) { |
| 637 ViewMsg_Navigate_Params params; | 637 ViewMsg_Navigate_Params params; |
| 638 params.page_id = -1; | 638 params.page_id = -1; |
| 639 params.pending_history_list_offset = -1; | 639 params.pending_history_list_offset = -1; |
| 640 params.current_history_list_offset = -1; | 640 params.current_history_list_offset = -1; |
| 641 params.current_history_list_length = 0; | 641 params.current_history_list_length = 0; |
| 642 params.url = url; | 642 params.url = url; |
| (...skipping 1519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2162 void RenderViewHostImpl::AttachToFrameTree() { | 2162 void RenderViewHostImpl::AttachToFrameTree() { |
| 2163 FrameTree* frame_tree = delegate_->GetFrameTree(); | 2163 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 2164 | 2164 |
| 2165 frame_tree->ResetForMainFrameSwap(); | 2165 frame_tree->ResetForMainFrameSwap(); |
| 2166 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { | 2166 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { |
| 2167 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); | 2167 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); |
| 2168 } | 2168 } |
| 2169 } | 2169 } |
| 2170 | 2170 |
| 2171 } // namespace content | 2171 } // namespace content |
| OLD | NEW |