| OLD | NEW |
| 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/browser/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 1661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1672 // Blink doesn't send throb notifications for JavaScript URLs, so it is not | 1672 // Blink doesn't send throb notifications for JavaScript URLs, so it is not |
| 1673 // done here either. | 1673 // done here either. |
| 1674 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) | 1674 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) |
| 1675 frame_tree_node_->DidStartLoading(true); | 1675 frame_tree_node_->DidStartLoading(true); |
| 1676 } | 1676 } |
| 1677 | 1677 |
| 1678 void RenderFrameHostImpl::NavigateToURL(const GURL& url) { | 1678 void RenderFrameHostImpl::NavigateToURL(const GURL& url) { |
| 1679 CommonNavigationParams common_params( | 1679 CommonNavigationParams common_params( |
| 1680 url, Referrer(), ui::PAGE_TRANSITION_LINK, FrameMsg_Navigate_Type::NORMAL, | 1680 url, Referrer(), ui::PAGE_TRANSITION_LINK, FrameMsg_Navigate_Type::NORMAL, |
| 1681 true, base::TimeTicks::Now(), FrameMsg_UILoadMetricsReportType::NO_REPORT, | 1681 true, base::TimeTicks::Now(), FrameMsg_UILoadMetricsReportType::NO_REPORT, |
| 1682 GURL(), GURL()); | 1682 GURL(), GURL(), false); |
| 1683 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); | 1683 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); |
| 1684 } | 1684 } |
| 1685 | 1685 |
| 1686 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, | 1686 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, |
| 1687 SiteInstance* source_site_instance) { | 1687 SiteInstance* source_site_instance) { |
| 1688 GURL validated_url(params.url); | 1688 GURL validated_url(params.url); |
| 1689 GetProcess()->FilterURL(false, &validated_url); | 1689 GetProcess()->FilterURL(false, &validated_url); |
| 1690 | 1690 |
| 1691 TRACE_EVENT1("navigation", "RenderFrameHostImpl::OpenURL", "url", | 1691 TRACE_EVENT1("navigation", "RenderFrameHostImpl::OpenURL", "url", |
| 1692 validated_url.possibly_invalid_spec()); | 1692 validated_url.possibly_invalid_spec()); |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2100 } | 2100 } |
| 2101 | 2101 |
| 2102 std::string RenderFrameHostImpl::CommitCountString() { | 2102 std::string RenderFrameHostImpl::CommitCountString() { |
| 2103 std::string result = base::Int64ToString(reinterpret_cast<int64_t>(this)); | 2103 std::string result = base::Int64ToString(reinterpret_cast<int64_t>(this)); |
| 2104 result += "/"; | 2104 result += "/"; |
| 2105 result += base::IntToString(commit_count_); | 2105 result += base::IntToString(commit_count_); |
| 2106 return result; | 2106 return result; |
| 2107 } | 2107 } |
| 2108 | 2108 |
| 2109 } // namespace content | 2109 } // namespace content |
| OLD | NEW |