| 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 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 // If this is an attempt to reload while we are swapped out, we should not | 585 // If this is an attempt to reload while we are swapped out, we should not |
| 586 // reload swappedout://, but the previous page, which is stored in | 586 // reload swappedout://, but the previous page, which is stored in |
| 587 // params.state. Setting is_reload to false will treat this like a back | 587 // params.state. Setting is_reload to false will treat this like a back |
| 588 // navigation to accomplish that. | 588 // navigation to accomplish that. |
| 589 is_reload = false; | 589 is_reload = false; |
| 590 cache_policy = WebURLRequest::ReloadIgnoringCacheData; | 590 cache_policy = WebURLRequest::ReloadIgnoringCacheData; |
| 591 | 591 |
| 592 // We refresh timezone when a view is swapped in since timezone | 592 // We refresh timezone when a view is swapped in since timezone |
| 593 // can get out of sync when the system timezone is updated while | 593 // can get out of sync when the system timezone is updated while |
| 594 // the view is swapped out. | 594 // the view is swapped out. |
| 595 RenderViewImpl::NotifyTimezoneChange(render_view_->webview()->mainFrame()); | 595 RenderViewImpl::NotifyTimezoneChange(); |
| 596 | 596 |
| 597 render_view_->SetSwappedOut(false); | 597 render_view_->SetSwappedOut(false); |
| 598 is_swapped_out_ = false; | 598 is_swapped_out_ = false; |
| 599 } | 599 } |
| 600 | 600 |
| 601 if (params.should_clear_history_list) { | 601 if (params.should_clear_history_list) { |
| 602 CHECK_EQ(params.pending_history_list_offset, -1); | 602 CHECK_EQ(params.pending_history_list_offset, -1); |
| 603 CHECK_EQ(params.current_history_list_offset, -1); | 603 CHECK_EQ(params.current_history_list_offset, -1); |
| 604 CHECK_EQ(params.current_history_list_length, 0); | 604 CHECK_EQ(params.current_history_list_length, 0); |
| 605 } | 605 } |
| (...skipping 2059 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2665 policy == blink::WebNavigationPolicyNewForegroundTab || | 2665 policy == blink::WebNavigationPolicyNewForegroundTab || |
| 2666 policy == blink::WebNavigationPolicyNewWindow || | 2666 policy == blink::WebNavigationPolicyNewWindow || |
| 2667 policy == blink::WebNavigationPolicyNewPopup) { | 2667 policy == blink::WebNavigationPolicyNewPopup) { |
| 2668 WebUserGestureIndicator::consumeUserGesture(); | 2668 WebUserGestureIndicator::consumeUserGesture(); |
| 2669 } | 2669 } |
| 2670 | 2670 |
| 2671 Send(new FrameHostMsg_OpenURL(routing_id_, params)); | 2671 Send(new FrameHostMsg_OpenURL(routing_id_, params)); |
| 2672 } | 2672 } |
| 2673 | 2673 |
| 2674 } // namespace content | 2674 } // namespace content |
| OLD | NEW |