Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Rebase to master Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 #include "chrome/browser/supervised_user/supervised_user_resource_throttle.h" 98 #include "chrome/browser/supervised_user/supervised_user_resource_throttle.h"
99 #endif 99 #endif
100 100
101 #if defined(USE_SYSTEM_PROTOBUF) 101 #if defined(USE_SYSTEM_PROTOBUF)
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/android/offline_pages/downloads/resource_throttle.h"
108 #include "chrome/browser/loader/data_reduction_proxy_resource_throttle_android.h " 109 #include "chrome/browser/loader/data_reduction_proxy_resource_throttle_android.h "
109 #include "components/navigation_interception/intercept_navigation_delegate.h" 110 #include "components/navigation_interception/intercept_navigation_delegate.h"
110 #endif 111 #endif
111 112
112 #if BUILDFLAG(ANDROID_JAVA_UI)
113 #include "chrome/browser/android/offline_pages/downloads/resource_throttle.h"
114 #endif
115
116 #if defined(OS_CHROMEOS) 113 #if defined(OS_CHROMEOS)
117 #include "chrome/browser/chromeos/login/signin/merge_session_resource_throttle.h " 114 #include "chrome/browser/chromeos/login/signin/merge_session_resource_throttle.h "
118 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" 115 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h"
119 #endif 116 #endif
120 117
121 using content::BrowserThread; 118 using content::BrowserThread;
122 using content::RenderViewHost; 119 using content::RenderViewHost;
123 using content::ResourceDispatcherHostLoginDelegate; 120 using content::ResourceDispatcherHostLoginDelegate;
124 using content::ResourceRequestInfo; 121 using content::ResourceRequestInfo;
125 using content::ResourceType; 122 using content::ResourceType;
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 request->url(), request->method())); 539 request->url(), request->method()));
543 } 540 }
544 541
545 // 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
546 // been added, so no need to add them again. 543 // been added, so no need to add them again.
547 if (is_new_request) { 544 if (is_new_request) {
548 AppendStandardResourceThrottles(request, 545 AppendStandardResourceThrottles(request,
549 resource_context, 546 resource_context,
550 content::RESOURCE_TYPE_MAIN_FRAME, 547 content::RESOURCE_TYPE_MAIN_FRAME,
551 throttles); 548 throttles);
552 #if BUILDFLAG(ANDROID_JAVA_UI) 549 #if defined(OS_ANDROID)
553 // On Android, forward text/html downloads to OfflinePages backend. 550 // On Android, forward text/html downloads to OfflinePages backend.
554 throttles->push_back( 551 throttles->push_back(
555 base::MakeUnique<offline_pages::downloads::ResourceThrottle>(request)); 552 base::MakeUnique<offline_pages::downloads::ResourceThrottle>(request));
556 #endif 553 #endif
557 } 554 }
558 } 555 }
559 556
560 ResourceDispatcherHostLoginDelegate* 557 ResourceDispatcherHostLoginDelegate*
561 ChromeResourceDispatcherHostDelegate::CreateLoginDelegate( 558 ChromeResourceDispatcherHostDelegate::CreateLoginDelegate(
562 net::AuthChallengeInfo* auth_info, net::URLRequest* request) { 559 net::AuthChallengeInfo* auth_info, net::URLRequest* request) {
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 base::Bind(&ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad, 896 base::Bind(&ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad,
900 base::Unretained(this), url, request_loading_time)); 897 base::Unretained(this), url, request_loading_time));
901 return; 898 return;
902 } 899 }
903 900
904 std::string metric_name = (request_loading_time.InMilliseconds() < 100 ? 901 std::string metric_name = (request_loading_time.InMilliseconds() < 100 ?
905 "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow"); 902 "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow");
906 rappor::SampleDomainAndRegistryFromGURL( 903 rappor::SampleDomainAndRegistryFromGURL(
907 g_browser_process->rappor_service(), metric_name, url); 904 g_browser_process->rappor_service(), metric_name, url);
908 } 905 }
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/media/router/media_router_dialog_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698