| 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/navigator_impl.h" | 5 #include "content/browser/frame_host/navigator_impl.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "content/common/view_messages.h" | 23 #include "content/common/view_messages.h" |
| 24 #include "content/public/browser/browser_context.h" | 24 #include "content/public/browser/browser_context.h" |
| 25 #include "content/public/browser/content_browser_client.h" | 25 #include "content/public/browser/content_browser_client.h" |
| 26 #include "content/public/browser/global_request_id.h" | 26 #include "content/public/browser/global_request_id.h" |
| 27 #include "content/public/browser/invalidate_type.h" | 27 #include "content/public/browser/invalidate_type.h" |
| 28 #include "content/public/browser/navigation_controller.h" | 28 #include "content/public/browser/navigation_controller.h" |
| 29 #include "content/public/browser/navigation_details.h" | 29 #include "content/public/browser/navigation_details.h" |
| 30 #include "content/public/browser/page_navigator.h" | 30 #include "content/public/browser/page_navigator.h" |
| 31 #include "content/public/browser/render_view_host.h" | 31 #include "content/public/browser/render_view_host.h" |
| 32 #include "content/public/browser/stream_handle.h" | 32 #include "content/public/browser/stream_handle.h" |
| 33 #include "content/public/browser/user_metrics.h" |
| 33 #include "content/public/common/bindings_policy.h" | 34 #include "content/public/common/bindings_policy.h" |
| 34 #include "content/public/common/content_client.h" | 35 #include "content/public/common/content_client.h" |
| 35 #include "content/public/common/content_switches.h" | 36 #include "content/public/common/content_switches.h" |
| 36 #include "content/public/common/resource_response.h" | 37 #include "content/public/common/resource_response.h" |
| 37 #include "content/public/common/url_constants.h" | 38 #include "content/public/common/url_constants.h" |
| 38 #include "content/public/common/url_utils.h" | 39 #include "content/public/common/url_utils.h" |
| 39 #include "net/base/load_flags.h" | 40 #include "net/base/load_flags.h" |
| 40 #include "net/http/http_response_headers.h" | 41 #include "net/http/http_response_headers.h" |
| 41 | 42 |
| 42 namespace content { | 43 namespace content { |
| (...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 866 MakeDefaultBeginNavigation(request_params, navigation_type), | 867 MakeDefaultBeginNavigation(request_params, navigation_type), |
| 867 navigation_request_map_.get(frame_tree_node_id)->common_params()); | 868 navigation_request_map_.get(frame_tree_node_id)->common_params()); |
| 868 return true; | 869 return true; |
| 869 } | 870 } |
| 870 | 871 |
| 871 void NavigatorImpl::RecordNavigationMetrics( | 872 void NavigatorImpl::RecordNavigationMetrics( |
| 872 const LoadCommittedDetails& details, | 873 const LoadCommittedDetails& details, |
| 873 const FrameHostMsg_DidCommitProvisionalLoad_Params& params, | 874 const FrameHostMsg_DidCommitProvisionalLoad_Params& params, |
| 874 SiteInstance* site_instance) { | 875 SiteInstance* site_instance) { |
| 875 DCHECK(site_instance->HasProcess()); | 876 DCHECK(site_instance->HasProcess()); |
| 877 |
| 878 if (!details.is_in_page) |
| 879 RecordAction(base::UserMetricsAction("FrameLoad")); |
| 880 |
| 876 if (!details.is_main_frame || !navigation_data_ || | 881 if (!details.is_main_frame || !navigation_data_ || |
| 877 navigation_data_->url_ != params.original_request_url) { | 882 navigation_data_->url_ != params.original_request_url) { |
| 878 return; | 883 return; |
| 879 } | 884 } |
| 880 | 885 |
| 881 base::TimeDelta time_to_commit = | 886 base::TimeDelta time_to_commit = |
| 882 base::TimeTicks::Now() - navigation_data_->start_time_; | 887 base::TimeTicks::Now() - navigation_data_->start_time_; |
| 883 UMA_HISTOGRAM_TIMES("Navigation.TimeToCommit", time_to_commit); | 888 UMA_HISTOGRAM_TIMES("Navigation.TimeToCommit", time_to_commit); |
| 884 | 889 |
| 885 time_to_commit -= navigation_data_->before_unload_delay_; | 890 time_to_commit -= navigation_data_->before_unload_delay_; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 911 "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted", | 916 "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted", |
| 912 time_to_commit); | 917 time_to_commit); |
| 913 UMA_HISTOGRAM_TIMES( | 918 UMA_HISTOGRAM_TIMES( |
| 914 "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted", | 919 "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted", |
| 915 time_to_network); | 920 time_to_network); |
| 916 } | 921 } |
| 917 navigation_data_.reset(); | 922 navigation_data_.reset(); |
| 918 } | 923 } |
| 919 | 924 |
| 920 } // namespace content | 925 } // namespace content |
| OLD | NEW |