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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
102 #include <google/protobuf/repeated_field.h> | 102 #include <google/protobuf/repeated_field.h> |
103 #else | 103 #else |
104 #include "third_party/protobuf/src/google/protobuf/repeated_field.h" | 104 #include "third_party/protobuf/src/google/protobuf/repeated_field.h" |
105 #endif | 105 #endif |
106 | 106 |
107 #if defined(OS_ANDROID) | 107 #if defined(OS_ANDROID) |
108 #include "chrome/browser/loader/data_reduction_proxy_resource_throttle_android.h " | 108 #include "chrome/browser/loader/data_reduction_proxy_resource_throttle_android.h " |
109 #include "components/navigation_interception/intercept_navigation_delegate.h" | 109 #include "components/navigation_interception/intercept_navigation_delegate.h" |
110 #endif | 110 #endif |
111 | 111 |
112 #if BUILDFLAG(ANDROID_JAVA_UI) | 112 #if defined(OS_ANDROID) |
Ted C
2017/01/06 22:33:30
combine with above
F
2017/01/09 21:36:33
Done.
| |
113 #include "chrome/browser/android/offline_pages/downloads/resource_throttle.h" | 113 #include "chrome/browser/android/offline_pages/downloads/resource_throttle.h" |
114 #endif | 114 #endif |
115 | 115 |
116 #if defined(OS_CHROMEOS) | 116 #if defined(OS_CHROMEOS) |
117 #include "chrome/browser/chromeos/login/signin/merge_session_resource_throttle.h " | 117 #include "chrome/browser/chromeos/login/signin/merge_session_resource_throttle.h " |
118 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" | 118 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" |
119 #endif | 119 #endif |
120 | 120 |
121 using content::BrowserThread; | 121 using content::BrowserThread; |
122 using content::RenderViewHost; | 122 using content::RenderViewHost; |
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
539 request->url(), request->method())); | 539 request->url(), request->method())); |
540 } | 540 } |
541 | 541 |
542 // If this isn't a new request, the standard resource throttles have already | 542 // If this isn't a new request, the standard resource throttles have already |
543 // been added, so no need to add them again. | 543 // been added, so no need to add them again. |
544 if (is_new_request) { | 544 if (is_new_request) { |
545 AppendStandardResourceThrottles(request, | 545 AppendStandardResourceThrottles(request, |
546 resource_context, | 546 resource_context, |
547 content::RESOURCE_TYPE_MAIN_FRAME, | 547 content::RESOURCE_TYPE_MAIN_FRAME, |
548 throttles); | 548 throttles); |
549 #if BUILDFLAG(ANDROID_JAVA_UI) | 549 #if defined(OS_ANDROID) |
550 // On Android, forward text/html downloads to OfflinePages backend. | 550 // On Android, forward text/html downloads to OfflinePages backend. |
551 throttles->push_back( | 551 throttles->push_back( |
552 base::MakeUnique<offline_pages::downloads::ResourceThrottle>(request)); | 552 base::MakeUnique<offline_pages::downloads::ResourceThrottle>(request)); |
553 #endif | 553 #endif |
554 } | 554 } |
555 } | 555 } |
556 | 556 |
557 ResourceDispatcherHostLoginDelegate* | 557 ResourceDispatcherHostLoginDelegate* |
558 ChromeResourceDispatcherHostDelegate::CreateLoginDelegate( | 558 ChromeResourceDispatcherHostDelegate::CreateLoginDelegate( |
559 net::AuthChallengeInfo* auth_info, net::URLRequest* request) { | 559 net::AuthChallengeInfo* auth_info, net::URLRequest* request) { |
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
895 base::Bind(&ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad, | 895 base::Bind(&ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad, |
896 base::Unretained(this), url, request_loading_time)); | 896 base::Unretained(this), url, request_loading_time)); |
897 return; | 897 return; |
898 } | 898 } |
899 | 899 |
900 std::string metric_name = (request_loading_time.InMilliseconds() < 100 ? | 900 std::string metric_name = (request_loading_time.InMilliseconds() < 100 ? |
901 "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow"); | 901 "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow"); |
902 rappor::SampleDomainAndRegistryFromGURL( | 902 rappor::SampleDomainAndRegistryFromGURL( |
903 g_browser_process->rappor_service(), metric_name, url); | 903 g_browser_process->rappor_service(), metric_name, url); |
904 } | 904 } |
OLD | NEW |