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

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

Issue 2580753002: Fix NavigationControllerBrowserTest. EnsureSamePageNavigationUpdatesFrameNavigationEntry browser nav (Closed)
Patch Set: Revert changes to browser-side-navigation.linux.content_browsertests.filter. Will do that in a sepa… Created 3 years, 12 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
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.h ('k') | content/browser/ssl/ssl_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/navigation_entry_impl.h" 5 #include "content/browser/frame_host/navigation_entry_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <queue> 9 #include <queue>
10 #include <utility> 10 #include <utility>
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 transition_type_(transition_type), 269 transition_type_(transition_type),
270 restore_type_(RestoreType::NONE), 270 restore_type_(RestoreType::NONE),
271 is_overriding_user_agent_(false), 271 is_overriding_user_agent_(false),
272 http_status_code_(0), 272 http_status_code_(0),
273 is_renderer_initiated_(is_renderer_initiated), 273 is_renderer_initiated_(is_renderer_initiated),
274 should_replace_entry_(false), 274 should_replace_entry_(false),
275 should_clear_history_list_(false), 275 should_clear_history_list_(false),
276 can_load_local_resources_(false), 276 can_load_local_resources_(false),
277 frame_tree_node_id_(-1), 277 frame_tree_node_id_(-1),
278 reload_type_(ReloadType::NONE), 278 reload_type_(ReloadType::NONE),
279 started_from_context_menu_(false) { 279 started_from_context_menu_(false),
280 ssl_error_(false) {
280 #if defined(OS_ANDROID) 281 #if defined(OS_ANDROID)
281 has_user_gesture_ = false; 282 has_user_gesture_ = false;
282 #endif 283 #endif
283 } 284 }
284 285
285 NavigationEntryImpl::~NavigationEntryImpl() { 286 NavigationEntryImpl::~NavigationEntryImpl() {
286 } 287 }
287 288
288 int NavigationEntryImpl::GetUniqueID() const { 289 int NavigationEntryImpl::GetUniqueID() const {
289 return unique_id_; 290 return unique_id_;
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 return node; 957 return node;
957 958
958 // Enqueue any children and keep looking. 959 // Enqueue any children and keep looking.
959 for (auto* child : node->children) 960 for (auto* child : node->children)
960 work_queue.push(child); 961 work_queue.push(child);
961 } 962 }
962 return nullptr; 963 return nullptr;
963 } 964 }
964 965
965 } // namespace content 966 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.h ('k') | content/browser/ssl/ssl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698