| 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 "content/browser/loader/cross_site_resource_handler.h" | 5 #include "content/browser/loader/cross_site_resource_handler.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 } | 85 } |
| 86 | 86 |
| 87 bool CheckNavigationPolicyOnUI(GURL url, int process_id, int render_frame_id) { | 87 bool CheckNavigationPolicyOnUI(GURL url, int process_id, int render_frame_id) { |
| 88 RenderFrameHostImpl* rfh = | 88 RenderFrameHostImpl* rfh = |
| 89 RenderFrameHostImpl::FromID(process_id, render_frame_id); | 89 RenderFrameHostImpl::FromID(process_id, render_frame_id); |
| 90 if (!rfh) | 90 if (!rfh) |
| 91 return false; | 91 return false; |
| 92 | 92 |
| 93 // TODO(nasko): This check is very simplistic and is used temporarily only | 93 // TODO(nasko): This check is very simplistic and is used temporarily only |
| 94 // for --site-per-process. It should be updated to match the check performed | 94 // for --site-per-process. It should be updated to match the check performed |
| 95 // by RenderFrameHostManager::UpdateRendererStateForNavigate. | 95 // by RenderFrameHostManager::UpdateStateForNavigate. |
| 96 return !SiteInstance::IsSameWebSite( | 96 return !SiteInstance::IsSameWebSite( |
| 97 rfh->GetSiteInstance()->GetBrowserContext(), | 97 rfh->GetSiteInstance()->GetBrowserContext(), |
| 98 rfh->GetSiteInstance()->GetSiteURL(), url); | 98 rfh->GetSiteInstance()->GetSiteURL(), url); |
| 99 } | 99 } |
| 100 | 100 |
| 101 } // namespace | 101 } // namespace |
| 102 | 102 |
| 103 CrossSiteResourceHandler::CrossSiteResourceHandler( | 103 CrossSiteResourceHandler::CrossSiteResourceHandler( |
| 104 scoped_ptr<ResourceHandler> next_handler, | 104 scoped_ptr<ResourceHandler> next_handler, |
| 105 net::URLRequest* request) | 105 net::URLRequest* request) |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 controller()->Resume(); | 378 controller()->Resume(); |
| 379 } | 379 } |
| 380 } | 380 } |
| 381 | 381 |
| 382 void CrossSiteResourceHandler::OnDidDefer() { | 382 void CrossSiteResourceHandler::OnDidDefer() { |
| 383 did_defer_ = true; | 383 did_defer_ = true; |
| 384 request()->LogBlockedBy("CrossSiteResourceHandler"); | 384 request()->LogBlockedBy("CrossSiteResourceHandler"); |
| 385 } | 385 } |
| 386 | 386 |
| 387 } // namespace content | 387 } // namespace content |
| OLD | NEW |