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

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

Issue 2765643002: Revert of PlzNavigate: send SourceLocation when mixed content is found (Closed)
Patch Set: Created 3 years, 9 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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 } 363 }
364 364
365 void set_base_url_for_data_url(const GURL& url) { 365 void set_base_url_for_data_url(const GURL& url) {
366 base_url_for_data_url_ = url; 366 base_url_for_data_url_ = url;
367 } 367 }
368 368
369 CSPDisposition should_check_main_world_csp() const { 369 CSPDisposition should_check_main_world_csp() const {
370 return should_check_main_world_csp_; 370 return should_check_main_world_csp_;
371 } 371 }
372 372
373 const SourceLocation& source_location() const { return source_location_; }
374 void set_source_location(const SourceLocation& source_location) {
375 source_location_ = source_location;
376 }
377
378 private: 373 private:
379 friend class NavigationHandleImplTest; 374 friend class NavigationHandleImplTest;
380 375
381 NavigationHandleImpl(const GURL& url, 376 NavigationHandleImpl(const GURL& url,
382 const std::vector<GURL>& redirect_chain, 377 const std::vector<GURL>& redirect_chain,
383 FrameTreeNode* frame_tree_node, 378 FrameTreeNode* frame_tree_node,
384 bool is_renderer_initiated, 379 bool is_renderer_initiated,
385 bool is_same_page, 380 bool is_same_page,
386 const base::TimeTicks& navigation_start, 381 const base::TimeTicks& navigation_start,
387 int pending_nav_entry_id, 382 int pending_nav_entry_id,
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 NavigationType navigation_type_; 539 NavigationType navigation_type_;
545 540
546 // Whether or not the CSP of the main world should apply. When the navigation 541 // Whether or not the CSP of the main world should apply. When the navigation
547 // is initiated from a content script in an isolated world, the CSP defined 542 // is initiated from a content script in an isolated world, the CSP defined
548 // in the main world should not apply. 543 // in the main world should not apply.
549 CSPDisposition should_check_main_world_csp_; 544 CSPDisposition should_check_main_world_csp_;
550 545
551 // Whether or not the navigation results from the submission of a form. 546 // Whether or not the navigation results from the submission of a form.
552 bool is_form_submission_; 547 bool is_form_submission_;
553 548
554 // PlzNavigate
555 // Information about the JavaScript that started the navigation. For
556 // navigations initiated by Javascript.
557 SourceLocation source_location_;
558
559 base::WeakPtrFactory<NavigationHandleImpl> weak_factory_; 549 base::WeakPtrFactory<NavigationHandleImpl> weak_factory_;
560 550
561 DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl); 551 DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
562 }; 552 };
563 553
564 } // namespace content 554 } // namespace content
565 555
566 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_ 556 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/mixed_content_navigation_throttle.cc ('k') | content/browser/frame_host/navigation_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698