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

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

Issue 173049: Revert r23616 from 172. (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/branches/172/src/
Patch Set: Created 11 years, 4 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
Property Changes:
Modified: svn:mergeinfo
Reverse-merged /trunk/src/chrome/browser/renderer_host/resource_dispatcher_host.cc:r21417
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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 7 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 pending_requests_.erase(iter); 806 pending_requests_.erase(iter);
807 807
808 // If we have no more pending requests, then stop the load state monitor 808 // If we have no more pending requests, then stop the load state monitor
809 if (pending_requests_.empty()) 809 if (pending_requests_.empty())
810 update_load_states_timer_.Stop(); 810 update_load_states_timer_.Stop();
811 } 811 }
812 812
813 // URLRequest::Delegate ------------------------------------------------------- 813 // URLRequest::Delegate -------------------------------------------------------
814 814
815 void ResourceDispatcherHost::OnReceivedRedirect(URLRequest* request, 815 void ResourceDispatcherHost::OnReceivedRedirect(URLRequest* request,
816 const GURL& new_url, 816 const GURL& new_url) {
817 bool* defer_redirect) {
818 RESOURCE_LOG("OnReceivedRedirect: " << request->url().spec()); 817 RESOURCE_LOG("OnReceivedRedirect: " << request->url().spec());
819 ExtraRequestInfo* info = ExtraInfoForRequest(request); 818 ExtraRequestInfo* info = ExtraInfoForRequest(request);
820 819
821 DCHECK(request->status().is_success()); 820 DCHECK(request->status().is_success());
822 821
823 if (info->process_type == ChildProcessInfo::RENDER_PROCESS && 822 if (info->process_type == ChildProcessInfo::RENDER_PROCESS &&
824 !RendererSecurityPolicy::GetInstance()-> 823 !RendererSecurityPolicy::GetInstance()->
825 CanRequestURL(info->process_id, new_url)) { 824 CanRequestURL(info->process_id, new_url)) {
826 LOG(INFO) << "Denied unauthorized request for " << 825 LOG(INFO) << "Denied unauthorized request for " <<
827 new_url.possibly_invalid_spec(); 826 new_url.possibly_invalid_spec();
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
1556 case ViewHostMsg_UploadProgress_ACK::ID: 1555 case ViewHostMsg_UploadProgress_ACK::ID:
1557 case ViewHostMsg_SyncLoad::ID: 1556 case ViewHostMsg_SyncLoad::ID:
1558 return true; 1557 return true;
1559 1558
1560 default: 1559 default:
1561 break; 1560 break;
1562 } 1561 }
1563 1562
1564 return false; 1563 return false;
1565 } 1564 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/resource_dispatcher_host.h ('k') | chrome/common/chrome_plugin_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698