Chromium Code Reviews| 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 "chrome/browser/loader/chrome_resource_dispatcher_host_delegate.h" | 5 #include "chrome/browser/loader/chrome_resource_dispatcher_host_delegate.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 100 #endif | 100 #endif |
| 101 | 101 |
| 102 #if defined(USE_SYSTEM_PROTOBUF) | 102 #if defined(USE_SYSTEM_PROTOBUF) |
| 103 #include <google/protobuf/repeated_field.h> | 103 #include <google/protobuf/repeated_field.h> |
| 104 #else | 104 #else |
| 105 #include "third_party/protobuf/src/google/protobuf/repeated_field.h" | 105 #include "third_party/protobuf/src/google/protobuf/repeated_field.h" |
| 106 #endif | 106 #endif |
| 107 | 107 |
| 108 #if defined(OS_ANDROID) | 108 #if defined(OS_ANDROID) |
| 109 #include "chrome/browser/android/download/intercept_download_resource_throttle.h " | 109 #include "chrome/browser/android/download/intercept_download_resource_throttle.h " |
| 110 #include "chrome/browser/android/offline_pages/background_loader_offliner.h" | |
| 110 #include "chrome/browser/android/offline_pages/downloads/resource_throttle.h" | 111 #include "chrome/browser/android/offline_pages/downloads/resource_throttle.h" |
| 111 #include "chrome/browser/loader/data_reduction_proxy_resource_throttle_android.h " | 112 #include "chrome/browser/loader/data_reduction_proxy_resource_throttle_android.h " |
| 112 #include "components/navigation_interception/intercept_navigation_delegate.h" | 113 #include "components/navigation_interception/intercept_navigation_delegate.h" |
| 113 #endif | 114 #endif |
| 114 | 115 |
| 115 #if defined(OS_CHROMEOS) | 116 #if defined(OS_CHROMEOS) |
| 116 #include "chrome/browser/chromeos/login/signin/merge_session_resource_throttle.h " | 117 #include "chrome/browser/chromeos/login/signin/merge_session_resource_throttle.h " |
| 117 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" | 118 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" |
| 118 #endif | 119 #endif |
| 119 | 120 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 169 prerender::PrerenderContents* prerender_contents = | 170 prerender::PrerenderContents* prerender_contents = |
| 170 prerender::PrerenderContents::FromWebContents(web_contents); | 171 prerender::PrerenderContents::FromWebContents(web_contents); |
| 171 | 172 |
| 172 if (prerender_contents) | 173 if (prerender_contents) |
| 173 prerender_contents->AddNetworkBytes(bytes); | 174 prerender_contents->AddNetworkBytes(bytes); |
| 174 | 175 |
| 175 prerender::PrerenderManager* prerender_manager = | 176 prerender::PrerenderManager* prerender_manager = |
| 176 GetPrerenderManager(web_contents); | 177 GetPrerenderManager(web_contents); |
| 177 if (prerender_manager) | 178 if (prerender_manager) |
| 178 prerender_manager->AddProfileNetworkBytesIfEnabled(bytes); | 179 prerender_manager->AddProfileNetworkBytesIfEnabled(bytes); |
| 180 | |
| 181 #if defined(OS_ANDROID) | |
| 182 offline_pages::BackgroundLoaderOffliner* background_loader = | |
| 183 offline_pages::BackgroundLoaderOffliner::FromWebContents(web_contents); | |
| 184 | |
| 185 if (background_loader) | |
| 186 background_loader->OnNetworkBytesChanged(bytes); | |
| 187 #endif // OS_ANDROID | |
|
mmenke
2017/03/15 16:27:26
Can we put this in NotifyUIThreadOfRequestComplete
chili
2017/03/15 18:02:09
I moved this section to NotifyUIThreadOfRequestCom
| |
| 179 } | 188 } |
| 180 | 189 |
| 181 #if BUILDFLAG(ENABLE_EXTENSIONS) | 190 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| 182 void SendExecuteMimeTypeHandlerEvent( | 191 void SendExecuteMimeTypeHandlerEvent( |
| 183 std::unique_ptr<content::StreamInfo> stream, | 192 std::unique_ptr<content::StreamInfo> stream, |
| 184 int64_t expected_content_size, | 193 int64_t expected_content_size, |
| 185 const std::string& extension_id, | 194 const std::string& extension_id, |
| 186 const std::string& view_id, | 195 const std::string& view_id, |
| 187 bool embedded, | 196 bool embedded, |
| 188 int frame_tree_node_id, | 197 int frame_tree_node_id, |
| (...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 925 base::Bind(&ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad, | 934 base::Bind(&ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad, |
| 926 base::Unretained(this), url, request_loading_time)); | 935 base::Unretained(this), url, request_loading_time)); |
| 927 return; | 936 return; |
| 928 } | 937 } |
| 929 | 938 |
| 930 std::string metric_name = (request_loading_time.InMilliseconds() < 100 ? | 939 std::string metric_name = (request_loading_time.InMilliseconds() < 100 ? |
| 931 "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow"); | 940 "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow"); |
| 932 rappor::SampleDomainAndRegistryFromGURL( | 941 rappor::SampleDomainAndRegistryFromGURL( |
| 933 g_browser_process->rappor_service(), metric_name, url); | 942 g_browser_process->rappor_service(), metric_name, url); |
| 934 } | 943 } |
| OLD | NEW |