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

Side by Side Diff: chrome/browser/renderer_host/safe_browsing_resource_handler.cc

Issue 353015: Last patch in removing MessageLoop* caching. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/renderer_host/safe_browsing_resource_handler.h" 5 #include "chrome/browser/renderer_host/safe_browsing_resource_handler.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 8 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
9 #include "chrome/browser/renderer_host/resource_message_filter.h" 9 #include "chrome/browser/renderer_host/resource_message_filter.h"
10 #include "chrome/common/notification_service.h" 10 #include "chrome/common/notification_service.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 queued_error_request_id_, *queued_error_.get(), 178 queued_error_request_id_, *queued_error_.get(),
179 queued_security_info_); 179 queued_security_info_);
180 queued_error_.reset(); 180 queued_error_.reset();
181 queued_security_info_.clear(); 181 queued_security_info_.clear();
182 } 182 }
183 183
184 Release(); 184 Release();
185 } else { 185 } else {
186 displaying_blocking_page_ = true; 186 displaying_blocking_page_ = true;
187 safe_browsing_->DisplayBlockingPage( 187 safe_browsing_->DisplayBlockingPage(
188 url, resource_type_, result, this, rdh_->ui_loop(), 188 url, resource_type_, result, this, render_process_host_id_,
189 render_process_host_id_, render_view_id_); 189 render_view_id_);
190 } 190 }
191 } 191 }
192 192
193 // SafeBrowsingService::Client implementation, called on the IO thread when 193 // SafeBrowsingService::Client implementation, called on the IO thread when
194 // the user has decided to proceed with the current request, or go back. 194 // the user has decided to proceed with the current request, or go back.
195 void SafeBrowsingResourceHandler::OnBlockingPageComplete(bool proceed) { 195 void SafeBrowsingResourceHandler::OnBlockingPageComplete(bool proceed) {
196 DCHECK(displaying_blocking_page_); 196 DCHECK(displaying_blocking_page_);
197 displaying_blocking_page_ = false; 197 displaying_blocking_page_ = false;
198 198
199 if (proceed) { 199 if (proceed) {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 bool defer = false; 241 bool defer = false;
242 next_handler_->OnRequestRedirected(redirect_id_, redirect_url_, 242 next_handler_->OnRequestRedirected(redirect_id_, redirect_url_,
243 redirect_response_, &defer); 243 redirect_response_, &defer);
244 if (!defer) 244 if (!defer)
245 rdh_->FollowDeferredRedirect(render_process_host_id_, redirect_id_); 245 rdh_->FollowDeferredRedirect(render_process_host_id_, redirect_id_);
246 246
247 redirect_response_ = NULL; 247 redirect_response_ = NULL;
248 redirect_id_ = -1; 248 redirect_id_ = -1;
249 Release(); 249 Release();
250 } 250 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698