Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Side by Side Diff: content/browser/frame_host/navigator_impl.cc

Issue 2583123002: Reload: FrameMsg_Navigate_Type cleanup to rename RELOAD_MAIN_RESOURCE (Closed)
Patch Set: replace logic update Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 namespace content { 51 namespace content {
52 52
53 namespace { 53 namespace {
54 54
55 FrameMsg_Navigate_Type::Value GetNavigationType( 55 FrameMsg_Navigate_Type::Value GetNavigationType(
56 BrowserContext* browser_context, 56 BrowserContext* browser_context,
57 const NavigationEntryImpl& entry, 57 const NavigationEntryImpl& entry,
58 ReloadType reload_type) { 58 ReloadType reload_type) {
59 switch (reload_type) { 59 switch (reload_type) {
60 case ReloadType::NORMAL: 60 case ReloadType::NORMAL:
61 return FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE; 61 return FrameMsg_Navigate_Type::RELOAD;
62 case ReloadType::BYPASSING_CACHE: 62 case ReloadType::BYPASSING_CACHE:
63 case ReloadType::DISABLE_LOFI_MODE: 63 case ReloadType::DISABLE_LOFI_MODE:
64 return FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE; 64 return FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE;
65 case ReloadType::ORIGINAL_REQUEST_URL: 65 case ReloadType::ORIGINAL_REQUEST_URL:
66 return FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL; 66 return FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL;
67 case ReloadType::NONE: 67 case ReloadType::NONE:
68 break; // Fall through to rest of function. 68 break; // Fall through to rest of function.
69 } 69 }
70 70
71 // |RenderViewImpl::PopulateStateFromPendingNavigationParams| differentiates 71 // |RenderViewImpl::PopulateStateFromPendingNavigationParams| differentiates
(...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1265 if (navigation_handle) 1265 if (navigation_handle)
1266 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); 1266 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID());
1267 1267
1268 controller_->SetPendingEntry(std::move(entry)); 1268 controller_->SetPendingEntry(std::move(entry));
1269 if (delegate_) 1269 if (delegate_)
1270 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); 1270 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
1271 } 1271 }
1272 } 1272 }
1273 1273
1274 } // namespace content 1274 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_request.cc ('k') | content/browser/frame_host/navigator_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698