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

Side by Side Diff: content/browser/frame_host/frame_navigation_entry.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 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_FRAME_NAVIGATION_ENTRY_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_
6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_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 "content/browser/site_instance_impl.h" 12 #include "content/browser/site_instance_impl.h"
13 #include "content/public/common/page_state.h" 13 #include "content/public/common/page_state.h"
14 #include "content/public/common/referrer.h" 14 #include "content/public/common/referrer.h"
15 #include "url/origin.h"
15 16
16 namespace content { 17 namespace content {
17 18
18 // Represents a session history item for a particular frame. 19 // Represents a session history item for a particular frame.
19 // 20 //
20 // This class is refcounted and can be shared across multiple NavigationEntries. 21 // This class is refcounted and can be shared across multiple NavigationEntries.
21 // For now, it is owned by a single NavigationEntry and only tracks the main 22 // For now, it is owned by a single NavigationEntry and only tracks the main
22 // frame. 23 // frame.
23 // 24 //
24 // If SiteIsolationPolicy::UseSubframeNavigationEntries is true, there will be a 25 // If SiteIsolationPolicy::UseSubframeNavigationEntries is true, there will be a
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // currently managed by NavigationEntry, but the logic will move here. 116 // currently managed by NavigationEntry, but the logic will move here.
116 // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 117 // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
117 118
118 // See the accessors above for descriptions. 119 // See the accessors above for descriptions.
119 int frame_tree_node_id_; 120 int frame_tree_node_id_;
120 std::string frame_unique_name_; 121 std::string frame_unique_name_;
121 int64_t item_sequence_number_; 122 int64_t item_sequence_number_;
122 int64_t document_sequence_number_; 123 int64_t document_sequence_number_;
123 scoped_refptr<SiteInstanceImpl> site_instance_; 124 scoped_refptr<SiteInstanceImpl> site_instance_;
124 GURL url_; 125 GURL url_;
126 url::Origin origin_;
Charlie Reis 2016/04/18 19:58:38 You don't need any changes to this file.
palmer 2016/04/18 23:37:35 Done.
125 Referrer referrer_; 127 Referrer referrer_;
126 // TODO(creis): Change this to FrameState. 128 // TODO(creis): Change this to FrameState.
127 PageState page_state_; 129 PageState page_state_;
128 130
129 DISALLOW_COPY_AND_ASSIGN(FrameNavigationEntry); 131 DISALLOW_COPY_AND_ASSIGN(FrameNavigationEntry);
130 }; 132 };
131 133
132 } // namespace content 134 } // namespace content
133 135
134 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_ 136 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698