Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 2618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2629 WebDataSource* data_source = | 2629 WebDataSource* data_source = |
| 2630 provisional_data_source ? provisional_data_source : top_data_source; | 2630 provisional_data_source ? provisional_data_source : top_data_source; |
| 2631 | 2631 |
| 2632 ui::PageTransition transition_type = ui::PAGE_TRANSITION_LINK; | 2632 ui::PageTransition transition_type = ui::PAGE_TRANSITION_LINK; |
| 2633 DocumentState* document_state = DocumentState::FromDataSource(data_source); | 2633 DocumentState* document_state = DocumentState::FromDataSource(data_source); |
| 2634 DCHECK(document_state); | 2634 DCHECK(document_state); |
| 2635 InternalDocumentStateData* internal_data = | 2635 InternalDocumentStateData* internal_data = |
| 2636 InternalDocumentStateData::FromDocumentState(document_state); | 2636 InternalDocumentStateData::FromDocumentState(document_state); |
| 2637 NavigationState* navigation_state = document_state->navigation_state(); | 2637 NavigationState* navigation_state = document_state->navigation_state(); |
| 2638 transition_type = navigation_state->transition_type(); | 2638 transition_type = navigation_state->transition_type(); |
| 2639 if (data_source->isClientRedirect()) { | |
|
mkosiba (inactive)
2014/10/07 11:38:49
This pretty much matches stuff we do in didCommitP
| |
| 2640 transition_type = static_cast<PageTransition>( | |
| 2641 transition_type | PAGE_TRANSITION_CLIENT_REDIRECT); | |
| 2642 } | |
| 2639 | 2643 |
| 2640 GURL request_url(request.url()); | 2644 GURL request_url(request.url()); |
| 2641 GURL new_url; | 2645 GURL new_url; |
| 2642 if (GetContentClient()->renderer()->WillSendRequest( | 2646 if (GetContentClient()->renderer()->WillSendRequest( |
| 2643 frame, | 2647 frame, |
| 2644 transition_type, | 2648 transition_type, |
| 2645 request_url, | 2649 request_url, |
| 2646 request.firstPartyForCookies(), | 2650 request.firstPartyForCookies(), |
| 2647 &new_url)) { | 2651 &new_url)) { |
| 2648 request.setURL(WebURL(new_url)); | 2652 request.setURL(WebURL(new_url)); |
| (...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3908 | 3912 |
| 3909 #if defined(ENABLE_BROWSER_CDMS) | 3913 #if defined(ENABLE_BROWSER_CDMS) |
| 3910 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3914 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 3911 if (!cdm_manager_) | 3915 if (!cdm_manager_) |
| 3912 cdm_manager_ = new RendererCdmManager(this); | 3916 cdm_manager_ = new RendererCdmManager(this); |
| 3913 return cdm_manager_; | 3917 return cdm_manager_; |
| 3914 } | 3918 } |
| 3915 #endif // defined(ENABLE_BROWSER_CDMS) | 3919 #endif // defined(ENABLE_BROWSER_CDMS) |
| 3916 | 3920 |
| 3917 } // namespace content | 3921 } // namespace content |
| OLD | NEW |