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/browser/frame_host/render_frame_host_manager.h" | 5 #include "content/browser/frame_host/render_frame_host_manager.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <string> | 10 #include <string> |
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 // If the current RenderFrameHost has a pending WebUI it must be committed. | 477 // If the current RenderFrameHost has a pending WebUI it must be committed. |
478 if (render_frame_host_->pending_web_ui()) | 478 if (render_frame_host_->pending_web_ui()) |
479 CommitPendingWebUI(); | 479 CommitPendingWebUI(); |
480 | 480 |
481 // A navigation in the original page has taken place. Cancel the pending | 481 // A navigation in the original page has taken place. Cancel the pending |
482 // one. Only do it for user gesture originated navigations to prevent page | 482 // one. Only do it for user gesture originated navigations to prevent page |
483 // doing any shenanigans to prevent user from navigating. See | 483 // doing any shenanigans to prevent user from navigating. See |
484 // https://code.google.com/p/chromium/issues/detail?id=75195 | 484 // https://code.google.com/p/chromium/issues/detail?id=75195 |
485 if (was_caused_by_user_gesture) { | 485 if (was_caused_by_user_gesture) { |
486 if (IsBrowserSideNavigationEnabled()) { | 486 if (IsBrowserSideNavigationEnabled()) { |
| 487 frame_tree_node_->ResetNavigationRequest(false, true); |
487 CleanUpNavigation(); | 488 CleanUpNavigation(); |
488 frame_tree_node_->ResetNavigationRequest(false, true); | |
489 } else { | 489 } else { |
490 CancelPending(); | 490 CancelPending(); |
491 } | 491 } |
492 } | 492 } |
493 } else { | 493 } else { |
494 // No one else should be sending us DidNavigate in this state. | 494 // No one else should be sending us DidNavigate in this state. |
495 NOTREACHED(); | 495 NOTREACHED(); |
496 } | 496 } |
497 } | 497 } |
498 | 498 |
(...skipping 2336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2835 delegate_->IsHidden()) { | 2835 delegate_->IsHidden()) { |
2836 if (delegate_->IsHidden()) { | 2836 if (delegate_->IsHidden()) { |
2837 render_frame_host_->GetView()->Hide(); | 2837 render_frame_host_->GetView()->Hide(); |
2838 } else { | 2838 } else { |
2839 render_frame_host_->GetView()->Show(); | 2839 render_frame_host_->GetView()->Show(); |
2840 } | 2840 } |
2841 } | 2841 } |
2842 } | 2842 } |
2843 | 2843 |
2844 } // namespace content | 2844 } // namespace content |
OLD | NEW |