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

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

Issue 2540563002: Move SafeBrowsingUIManager::UnsafeResource to security_interstitials namespace (Closed)
Patch Set: rebase update Created 4 years 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/data_reduction_proxy_resource_throttle_android.h " 5 #include "chrome/browser/loader/data_reduction_proxy_resource_throttle_android.h "
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/prerender/prerender_contents.h" 9 #include "chrome/browser/prerender/prerender_contents.h"
10 #include "chrome/browser/profiles/profile_io_data.h" 10 #include "chrome/browser/profiles/profile_io_data.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 return; 79 return;
80 80
81 if (request_->load_flags() & net::LOAD_PREFETCH) { 81 if (request_->load_flags() & net::LOAD_PREFETCH) {
82 controller()->Cancel(); 82 controller()->Cancel();
83 return; 83 return;
84 } 84 }
85 const content::ResourceRequestInfo* info = 85 const content::ResourceRequestInfo* info =
86 content::ResourceRequestInfo::ForRequest(request_); 86 content::ResourceRequestInfo::ForRequest(request_);
87 87
88 state_ = STATE_DISPLAYING_BLOCKING_PAGE; 88 state_ = STATE_DISPLAYING_BLOCKING_PAGE;
89 SafeBrowsingUIManager::UnsafeResource unsafe_resource; 89 security_interstitials::UnsafeResource unsafe_resource;
90 unsafe_resource.url = redirect_info.new_url; 90 unsafe_resource.url = redirect_info.new_url;
91 unsafe_resource.original_url = request_->original_url(); 91 unsafe_resource.original_url = request_->original_url();
92 unsafe_resource.redirect_urls = redirect_urls_; 92 unsafe_resource.redirect_urls = redirect_urls_;
93 unsafe_resource.is_subresource = is_subresource_; 93 unsafe_resource.is_subresource = is_subresource_;
94 unsafe_resource.is_subframe = is_subframe_; 94 unsafe_resource.is_subframe = is_subframe_;
95 unsafe_resource.threat_type = threat_type; 95 unsafe_resource.threat_type = threat_type;
96 unsafe_resource.callback = base::Bind( 96 unsafe_resource.callback = base::Bind(
97 &DataReductionProxyResourceThrottle::OnBlockingPageComplete, AsWeakPtr()); 97 &DataReductionProxyResourceThrottle::OnBlockingPageComplete, AsWeakPtr());
98 unsafe_resource.callback_thread = 98 unsafe_resource.callback_thread =
99 content::BrowserThread::GetTaskRunnerForThread( 99 content::BrowserThread::GetTaskRunnerForThread(
(...skipping 11 matching lines...) Expand all
111 } 111 }
112 112
113 const char* DataReductionProxyResourceThrottle::GetNameForLogging() const { 113 const char* DataReductionProxyResourceThrottle::GetNameForLogging() const {
114 return "DataReductionProxyResourceThrottle"; 114 return "DataReductionProxyResourceThrottle";
115 } 115 }
116 116
117 // static 117 // static
118 void DataReductionProxyResourceThrottle::StartDisplayingBlockingPage( 118 void DataReductionProxyResourceThrottle::StartDisplayingBlockingPage(
119 const base::WeakPtr<DataReductionProxyResourceThrottle>& throttle, 119 const base::WeakPtr<DataReductionProxyResourceThrottle>& throttle,
120 scoped_refptr<SafeBrowsingUIManager> ui_manager, 120 scoped_refptr<SafeBrowsingUIManager> ui_manager,
121 const SafeBrowsingUIManager::UnsafeResource& resource) { 121 const security_interstitials::UnsafeResource& resource) {
122 DCHECK_CURRENTLY_ON(BrowserThread::UI); 122 DCHECK_CURRENTLY_ON(BrowserThread::UI);
123 123
124 content::WebContents* web_contents = resource.web_contents_getter.Run(); 124 content::WebContents* web_contents = resource.web_contents_getter.Run();
125 if (web_contents) { 125 if (web_contents) {
126 prerender::PrerenderContents* prerender_contents = 126 prerender::PrerenderContents* prerender_contents =
127 prerender::PrerenderContents::FromWebContents(web_contents); 127 prerender::PrerenderContents::FromWebContents(web_contents);
128 if (prerender_contents) { 128 if (prerender_contents) {
129 prerender_contents->Destroy(prerender::FINAL_STATUS_SAFE_BROWSING); 129 prerender_contents->Destroy(prerender::FINAL_STATUS_SAFE_BROWSING);
130 content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE, 130 content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
131 base::Bind(resource.callback, false)); 131 base::Bind(resource.callback, false));
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 return result; 171 return result;
172 } 172 }
173 173
174 void DataReductionProxyResourceThrottle::ResumeRequest() { 174 void DataReductionProxyResourceThrottle::ResumeRequest() {
175 CHECK(state_ == STATE_NONE); 175 CHECK(state_ == STATE_NONE);
176 176
177 // Inject the header before resuming the request. 177 // Inject the header before resuming the request.
178 request_->SetExtraRequestHeaderByName(kUnsafeUrlProceedHeader, "1", true); 178 request_->SetExtraRequestHeaderByName(kUnsafeUrlProceedHeader, "1", true);
179 controller()->Resume(); 179 controller()->Resume();
180 } 180 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698