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

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

Issue 9999010: Store original request URL in NavigationEntry (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added to unit test Created 8 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_TAB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 virtual PageTransition GetTransitionType() const OVERRIDE; 53 virtual PageTransition GetTransitionType() const OVERRIDE;
54 virtual const GURL& GetUserTypedURL() const OVERRIDE; 54 virtual const GURL& GetUserTypedURL() const OVERRIDE;
55 virtual void SetHasPostData(bool has_post_data) OVERRIDE; 55 virtual void SetHasPostData(bool has_post_data) OVERRIDE;
56 virtual bool GetHasPostData() const OVERRIDE; 56 virtual bool GetHasPostData() const OVERRIDE;
57 virtual void SetPostID(int64 post_id) OVERRIDE; 57 virtual void SetPostID(int64 post_id) OVERRIDE;
58 virtual int64 GetPostID() const OVERRIDE; 58 virtual int64 GetPostID() const OVERRIDE;
59 virtual const FaviconStatus& GetFavicon() const OVERRIDE; 59 virtual const FaviconStatus& GetFavicon() const OVERRIDE;
60 virtual FaviconStatus& GetFavicon() OVERRIDE; 60 virtual FaviconStatus& GetFavicon() OVERRIDE;
61 virtual const SSLStatus& GetSSL() const OVERRIDE; 61 virtual const SSLStatus& GetSSL() const OVERRIDE;
62 virtual SSLStatus& GetSSL() OVERRIDE; 62 virtual SSLStatus& GetSSL() OVERRIDE;
63 virtual void SetOriginalRequestURL(const GURL& original_url) OVERRIDE;
64 virtual const GURL& GetOriginalRequestURL() const OVERRIDE;
63 65
64 void set_unique_id(int unique_id) { 66 void set_unique_id(int unique_id) {
65 unique_id_ = unique_id; 67 unique_id_ = unique_id;
66 } 68 }
67 69
68 // The SiteInstance tells us how to share sub-processes when the tab type is 70 // The SiteInstance tells us how to share sub-processes when the tab type is
69 // TAB_CONTENTS_WEB. This will be NULL otherwise. This is a reference counted 71 // TAB_CONTENTS_WEB. This will be NULL otherwise. This is a reference counted
70 // pointer to a shared site instance. 72 // pointer to a shared site instance.
71 // 73 //
72 // Note that the SiteInstance should usually not be changed after it is set, 74 // Note that the SiteInstance should usually not be changed after it is set,
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 string16 title_; 173 string16 title_;
172 FaviconStatus favicon_; 174 FaviconStatus favicon_;
173 std::string content_state_; 175 std::string content_state_;
174 int32 page_id_; 176 int32 page_id_;
175 SSLStatus ssl_; 177 SSLStatus ssl_;
176 PageTransition transition_type_; 178 PageTransition transition_type_;
177 GURL user_typed_url_; 179 GURL user_typed_url_;
178 bool has_post_data_; 180 bool has_post_data_;
179 int64 post_id_; 181 int64 post_id_;
180 RestoreType restore_type_; 182 RestoreType restore_type_;
183 GURL original_request_url_;
181 184
182 // This member is not persisted with sesssion restore. 185 // This member is not persisted with sesssion restore.
183 std::string extra_headers_; 186 std::string extra_headers_;
184 187
185 // Whether the entry, while loading, was created for a renderer-initiated 188 // Whether the entry, while loading, was created for a renderer-initiated
186 // navigation. This dictates whether the URL should be displayed before the 189 // navigation. This dictates whether the URL should be displayed before the
187 // navigation commits. It is cleared on commit and not persisted. 190 // navigation commits. It is cleared on commit and not persisted.
188 bool is_renderer_initiated_; 191 bool is_renderer_initiated_;
189 192
190 // This is a cached version of the result of GetTitleForDisplay. It prevents 193 // This is a cached version of the result of GetTitleForDisplay. It prevents
(...skipping 17 matching lines...) Expand all
208 // instance, instead of a new navigation. This value should not be persisted 211 // instance, instead of a new navigation. This value should not be persisted
209 // and is not needed after the entry commits. 212 // and is not needed after the entry commits.
210 bool is_cross_site_reload_; 213 bool is_cross_site_reload_;
211 214
212 // Copy and assignment is explicitly allowed for this class. 215 // Copy and assignment is explicitly allowed for this class.
213 }; 216 };
214 217
215 } // namespace content 218 } // namespace content
216 219
217 #endif // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 220 #endif // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698