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

Side by Side Diff: content/browser/frame_host/navigation_handle_impl.h

Issue 2949853002: Rename is_same_page to is_same_document in NavigationHandle. (Closed)
Patch Set: Created 3 years, 6 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
7 7
8 #include "content/public/browser/navigation_handle.h" 8 #include "content/public/browser/navigation_handle.h"
9 9
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 // start with |url|. Otherwise |redirect_chain| is used as the starting point. 81 // start with |url|. Otherwise |redirect_chain| is used as the starting point.
82 // |navigation_start| comes from the DidStartProvisionalLoad IPC, which tracks 82 // |navigation_start| comes from the DidStartProvisionalLoad IPC, which tracks
83 // both renderer-initiated and browser-initiated navigation start. 83 // both renderer-initiated and browser-initiated navigation start.
84 // PlzNavigate: This value always comes from the CommonNavigationParams 84 // PlzNavigate: This value always comes from the CommonNavigationParams
85 // associated with this navigation. 85 // associated with this navigation.
86 static std::unique_ptr<NavigationHandleImpl> Create( 86 static std::unique_ptr<NavigationHandleImpl> Create(
87 const GURL& url, 87 const GURL& url,
88 const std::vector<GURL>& redirect_chain, 88 const std::vector<GURL>& redirect_chain,
89 FrameTreeNode* frame_tree_node, 89 FrameTreeNode* frame_tree_node,
90 bool is_renderer_initiated, 90 bool is_renderer_initiated,
91 bool is_same_page, 91 bool is_same_document,
92 const base::TimeTicks& navigation_start, 92 const base::TimeTicks& navigation_start,
93 int pending_nav_entry_id, 93 int pending_nav_entry_id,
94 bool started_from_context_menu, 94 bool started_from_context_menu,
95 CSPDisposition should_check_main_world_csp, 95 CSPDisposition should_check_main_world_csp,
96 bool is_form_submission); 96 bool is_form_submission);
97 ~NavigationHandleImpl() override; 97 ~NavigationHandleImpl() override;
98 98
99 // Used to track the state the navigation is currently in. 99 // Used to track the state the navigation is currently in.
100 enum State { 100 enum State {
101 INITIAL = 0, 101 INITIAL = 0,
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 // url we're navigating to. 382 // url we're navigating to.
383 void SetExpectedProcess(RenderProcessHost* expected_process); 383 void SetExpectedProcess(RenderProcessHost* expected_process);
384 384
385 private: 385 private:
386 friend class NavigationHandleImplTest; 386 friend class NavigationHandleImplTest;
387 387
388 NavigationHandleImpl(const GURL& url, 388 NavigationHandleImpl(const GURL& url,
389 const std::vector<GURL>& redirect_chain, 389 const std::vector<GURL>& redirect_chain,
390 FrameTreeNode* frame_tree_node, 390 FrameTreeNode* frame_tree_node,
391 bool is_renderer_initiated, 391 bool is_renderer_initiated,
392 bool is_same_page, 392 bool is_same_document,
393 const base::TimeTicks& navigation_start, 393 const base::TimeTicks& navigation_start,
394 int pending_nav_entry_id, 394 int pending_nav_entry_id,
395 bool started_from_context_menu, 395 bool started_from_context_menu,
396 CSPDisposition should_check_main_world_csp, 396 CSPDisposition should_check_main_world_csp,
397 bool is_form_submission); 397 bool is_form_submission);
398 398
399 NavigationThrottle::ThrottleCheckResult CheckWillStartRequest(); 399 NavigationThrottle::ThrottleCheckResult CheckWillStartRequest();
400 NavigationThrottle::ThrottleCheckResult CheckWillRedirectRequest(); 400 NavigationThrottle::ThrottleCheckResult CheckWillRedirectRequest();
401 NavigationThrottle::ThrottleCheckResult CheckWillProcessResponse(); 401 NavigationThrottle::ThrottleCheckResult CheckWillProcessResponse();
402 402
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 // See NavigationHandle for a description of those member variables. 437 // See NavigationHandle for a description of those member variables.
438 GURL url_; 438 GURL url_;
439 scoped_refptr<SiteInstance> starting_site_instance_; 439 scoped_refptr<SiteInstance> starting_site_instance_;
440 Referrer sanitized_referrer_; 440 Referrer sanitized_referrer_;
441 bool has_user_gesture_; 441 bool has_user_gesture_;
442 ui::PageTransition transition_; 442 ui::PageTransition transition_;
443 bool is_external_protocol_; 443 bool is_external_protocol_;
444 net::Error net_error_code_; 444 net::Error net_error_code_;
445 RenderFrameHostImpl* render_frame_host_; 445 RenderFrameHostImpl* render_frame_host_;
446 const bool is_renderer_initiated_; 446 const bool is_renderer_initiated_;
447 const bool is_same_page_; 447 const bool is_same_document_;
448 bool was_redirected_; 448 bool was_redirected_;
449 bool did_replace_entry_; 449 bool did_replace_entry_;
450 bool should_update_history_; 450 bool should_update_history_;
451 bool subframe_entry_committed_; 451 bool subframe_entry_committed_;
452 scoped_refptr<net::HttpResponseHeaders> response_headers_; 452 scoped_refptr<net::HttpResponseHeaders> response_headers_;
453 net::HttpResponseInfo::ConnectionInfo connection_info_; 453 net::HttpResponseInfo::ConnectionInfo connection_info_;
454 454
455 // The original url of the navigation. This may differ from |url_| if the 455 // The original url of the navigation. This may differ from |url_| if the
456 // navigation encounters redirects. 456 // navigation encounters redirects.
457 const GURL original_url_; 457 const GURL original_url_;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 int expected_render_process_host_id_; 581 int expected_render_process_host_id_;
582 582
583 base::WeakPtrFactory<NavigationHandleImpl> weak_factory_; 583 base::WeakPtrFactory<NavigationHandleImpl> weak_factory_;
584 584
585 DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl); 585 DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
586 }; 586 };
587 587
588 } // namespace content 588 } // namespace content
589 589
590 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_ 590 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/interstitial_page_navigator_impl.cc ('k') | content/browser/frame_host/navigation_handle_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698