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

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

Issue 1814993002: Handle about:blank in the Origin Info Bubble better. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add and use {Get,Set}Origin in NavigationEntry. Created 4 years, 8 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 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "content/browser/frame_host/frame_navigation_entry.h" 15 #include "content/browser/frame_host/frame_navigation_entry.h"
16 #include "content/browser/frame_host/frame_tree_node.h" 16 #include "content/browser/frame_host/frame_tree_node.h"
17 #include "content/browser/site_instance_impl.h" 17 #include "content/browser/site_instance_impl.h"
18 #include "content/common/frame_message_enums.h" 18 #include "content/common/frame_message_enums.h"
19 #include "content/public/browser/favicon_status.h" 19 #include "content/public/browser/favicon_status.h"
20 #include "content/public/browser/global_request_id.h" 20 #include "content/public/browser/global_request_id.h"
21 #include "content/public/browser/navigation_entry.h" 21 #include "content/public/browser/navigation_entry.h"
22 #include "content/public/common/page_state.h" 22 #include "content/public/common/page_state.h"
23 #include "content/public/common/ssl_status.h" 23 #include "content/public/common/ssl_status.h"
24 #include "url/origin.h"
24 25
25 namespace content { 26 namespace content {
26 struct CommonNavigationParams; 27 struct CommonNavigationParams;
27 struct RequestNavigationParams; 28 struct RequestNavigationParams;
28 struct StartNavigationParams; 29 struct StartNavigationParams;
29 30
30 class CONTENT_EXPORT NavigationEntryImpl 31 class CONTENT_EXPORT NavigationEntryImpl
31 : public NON_EXPORTED_BASE(NavigationEntry) { 32 : public NON_EXPORTED_BASE(NavigationEntry) {
32 public: 33 public:
33 // Represents a tree of FrameNavigationEntries that make up this joint session 34 // Represents a tree of FrameNavigationEntries that make up this joint session
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 const base::string16& title, 77 const base::string16& title,
77 ui::PageTransition transition_type, 78 ui::PageTransition transition_type,
78 bool is_renderer_initiated); 79 bool is_renderer_initiated);
79 ~NavigationEntryImpl() override; 80 ~NavigationEntryImpl() override;
80 81
81 // NavigationEntry implementation: 82 // NavigationEntry implementation:
82 int GetUniqueID() const override; 83 int GetUniqueID() const override;
83 PageType GetPageType() const override; 84 PageType GetPageType() const override;
84 void SetURL(const GURL& url) override; 85 void SetURL(const GURL& url) override;
85 const GURL& GetURL() const override; 86 const GURL& GetURL() const override;
87 void SetOrigin(const url::Origin& origin) override;
88 const url::Origin& GetOrigin() const override;
86 void SetBaseURLForDataURL(const GURL& url) override; 89 void SetBaseURLForDataURL(const GURL& url) override;
87 const GURL& GetBaseURLForDataURL() const override; 90 const GURL& GetBaseURLForDataURL() const override;
88 #if defined(OS_ANDROID) 91 #if defined(OS_ANDROID)
89 void SetDataURLAsString( 92 void SetDataURLAsString(
90 scoped_refptr<base::RefCountedString> data_url) override; 93 scoped_refptr<base::RefCountedString> data_url) override;
91 const scoped_refptr<const base::RefCountedString> GetDataURLAsString() 94 const scoped_refptr<const base::RefCountedString> GetDataURLAsString()
92 const override; 95 const override;
93 #endif 96 #endif
94 void SetReferrer(const Referrer& referrer) override; 97 void SetReferrer(const Referrer& referrer) override;
95 const Referrer& GetReferrer() const override; 98 const Referrer& GetReferrer() const override;
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 499
497 // Whether the URL load carries a user gesture. 500 // Whether the URL load carries a user gesture.
498 bool has_user_gesture_; 501 bool has_user_gesture_;
499 #endif 502 #endif
500 503
501 // Used to store extra data to support browser features. This member is not 504 // Used to store extra data to support browser features. This member is not
502 // persisted, unless specific data is taken out/put back in at save/restore 505 // persisted, unless specific data is taken out/put back in at save/restore
503 // time (see TabNavigation for an example of this). 506 // time (see TabNavigation for an example of this).
504 std::map<std::string, base::string16> extra_data_; 507 std::map<std::string, base::string16> extra_data_;
505 508
509 // The effective Origin at the time of commit.
510 url::Origin origin_;
Charlie Reis 2016/04/18 19:58:38 Please put this above browser_initiated_post_data_
palmer 2016/04/18 23:37:35 Done.
511
506 DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl); 512 DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl);
507 }; 513 };
508 514
509 } // namespace content 515 } // namespace content
510 516
511 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ 517 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698