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

Side by Side Diff: content/browser/web_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: Rebasing 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_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_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. This is a reference 70 // The SiteInstance tells us how to share sub-processes. This is a reference
69 // counted pointer to a shared site instance. 71 // counted pointer to a shared site instance.
70 // 72 //
71 // Note that the SiteInstance should usually not be changed after it is set, 73 // Note that the SiteInstance should usually not be changed after it is set,
72 // but this may happen if the NavigationEntry was cloned and needs to use a 74 // but this may happen if the NavigationEntry was cloned and needs to use a
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 string16 title_; 172 string16 title_;
171 FaviconStatus favicon_; 173 FaviconStatus favicon_;
172 std::string content_state_; 174 std::string content_state_;
173 int32 page_id_; 175 int32 page_id_;
174 SSLStatus ssl_; 176 SSLStatus ssl_;
175 PageTransition transition_type_; 177 PageTransition transition_type_;
176 GURL user_typed_url_; 178 GURL user_typed_url_;
177 bool has_post_data_; 179 bool has_post_data_;
178 int64 post_id_; 180 int64 post_id_;
179 RestoreType restore_type_; 181 RestoreType restore_type_;
182 GURL original_request_url_;
180 183
181 // This member is not persisted with sesssion restore. 184 // This member is not persisted with sesssion restore.
182 std::string extra_headers_; 185 std::string extra_headers_;
183 186
184 // Whether the entry, while loading, was created for a renderer-initiated 187 // Whether the entry, while loading, was created for a renderer-initiated
185 // navigation. This dictates whether the URL should be displayed before the 188 // navigation. This dictates whether the URL should be displayed before the
186 // navigation commits. It is cleared on commit and not persisted. 189 // navigation commits. It is cleared on commit and not persisted.
187 bool is_renderer_initiated_; 190 bool is_renderer_initiated_;
188 191
189 // This is a cached version of the result of GetTitleForDisplay. It prevents 192 // This is a cached version of the result of GetTitleForDisplay. It prevents
(...skipping 17 matching lines...) Expand all
207 // instance, instead of a new navigation. This value should not be persisted 210 // instance, instead of a new navigation. This value should not be persisted
208 // and is not needed after the entry commits. 211 // and is not needed after the entry commits.
209 bool is_cross_site_reload_; 212 bool is_cross_site_reload_;
210 213
211 // Copy and assignment is explicitly allowed for this class. 214 // Copy and assignment is explicitly allowed for this class.
212 }; 215 };
213 216
214 } // namespace content 217 } // namespace content
215 218
216 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 219 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/navigation_controller_impl.cc ('k') | content/browser/web_contents/navigation_entry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698