| 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/navigator_impl.h" | 5 #include "content/browser/frame_host/navigator_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 namespace content { | 47 namespace content { |
| 48 | 48 |
| 49 namespace { | 49 namespace { |
| 50 | 50 |
| 51 FrameMsg_Navigate_Type::Value GetNavigationType( | 51 FrameMsg_Navigate_Type::Value GetNavigationType( |
| 52 BrowserContext* browser_context, const NavigationEntryImpl& entry, | 52 BrowserContext* browser_context, const NavigationEntryImpl& entry, |
| 53 NavigationController::ReloadType reload_type) { | 53 NavigationController::ReloadType reload_type) { |
| 54 switch (reload_type) { | 54 switch (reload_type) { |
| 55 case NavigationControllerImpl::RELOAD: | 55 case NavigationControllerImpl::RELOAD: |
| 56 return FrameMsg_Navigate_Type::RELOAD; | 56 return FrameMsg_Navigate_Type::RELOAD; |
| 57 case NavigationControllerImpl::RELOAD_IGNORING_CACHE: | 57 case NavigationControllerImpl::RELOAD_BYPASSING_CACHE: |
| 58 case NavigationControllerImpl::RELOAD_DISABLE_LOFI_MODE: | 58 case NavigationControllerImpl::RELOAD_DISABLE_LOFI_MODE: |
| 59 return FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE; | 59 return FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE; |
| 60 case NavigationControllerImpl::RELOAD_ORIGINAL_REQUEST_URL: | 60 case NavigationControllerImpl::RELOAD_ORIGINAL_REQUEST_URL: |
| 61 return FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL; | 61 return FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL; |
| 62 case NavigationControllerImpl::NO_RELOAD: | 62 case NavigationControllerImpl::NO_RELOAD: |
| 63 break; // Fall through to rest of function. | 63 break; // Fall through to rest of function. |
| 64 } | 64 } |
| 65 | 65 |
| 66 // |RenderViewImpl::PopulateStateFromPendingNavigationParams| differentiates | 66 // |RenderViewImpl::PopulateStateFromPendingNavigationParams| differentiates |
| 67 // between |RESTORE_WITH_POST| and |RESTORE|. | 67 // between |RESTORE_WITH_POST| and |RESTORE|. |
| 68 if (entry.restore_type() == | 68 if (entry.restore_type() == |
| 69 NavigationEntryImpl::RESTORE_LAST_SESSION_EXITED_CLEANLY) { | 69 NavigationEntryImpl::RESTORE_LAST_SESSION_EXITED_CLEANLY) { |
| (...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1135 if (pending_entry != controller_->GetVisibleEntry() || | 1135 if (pending_entry != controller_->GetVisibleEntry() || |
| 1136 !should_preserve_entry) { | 1136 !should_preserve_entry) { |
| 1137 controller_->DiscardPendingEntry(true); | 1137 controller_->DiscardPendingEntry(true); |
| 1138 | 1138 |
| 1139 // Also force the UI to refresh. | 1139 // Also force the UI to refresh. |
| 1140 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); | 1140 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); |
| 1141 } | 1141 } |
| 1142 } | 1142 } |
| 1143 | 1143 |
| 1144 } // namespace content | 1144 } // namespace content |
| OLD | NEW |