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

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

Issue 11415292: [Search] No longer reverting omnibox text on instant search (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: More tests Created 8 years 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 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "content/browser/site_instance_impl.h" 10 #include "content/browser/site_instance_impl.h"
(...skipping 25 matching lines...) Expand all
36 virtual void SetURL(const GURL& url) OVERRIDE; 36 virtual void SetURL(const GURL& url) OVERRIDE;
37 virtual const GURL& GetURL() const OVERRIDE; 37 virtual const GURL& GetURL() const OVERRIDE;
38 virtual void SetBaseURLForDataURL(const GURL& url) OVERRIDE; 38 virtual void SetBaseURLForDataURL(const GURL& url) OVERRIDE;
39 virtual const GURL& GetBaseURLForDataURL() const OVERRIDE; 39 virtual const GURL& GetBaseURLForDataURL() const OVERRIDE;
40 virtual void SetReferrer(const Referrer& referrer) OVERRIDE; 40 virtual void SetReferrer(const Referrer& referrer) OVERRIDE;
41 virtual const Referrer& GetReferrer() const OVERRIDE; 41 virtual const Referrer& GetReferrer() const OVERRIDE;
42 virtual void SetVirtualURL(const GURL& url) OVERRIDE; 42 virtual void SetVirtualURL(const GURL& url) OVERRIDE;
43 virtual const GURL& GetVirtualURL() const OVERRIDE; 43 virtual const GURL& GetVirtualURL() const OVERRIDE;
44 virtual void SetTitle(const string16& title) OVERRIDE; 44 virtual void SetTitle(const string16& title) OVERRIDE;
45 virtual const string16& GetTitle() const OVERRIDE; 45 virtual const string16& GetTitle() const OVERRIDE;
46 virtual void SetSearchTerms(const string16& search_terms) OVERRIDE;
47 virtual const string16& GetSearchTerms() const OVERRIDE;
46 virtual void SetContentState(const std::string& state) OVERRIDE; 48 virtual void SetContentState(const std::string& state) OVERRIDE;
47 virtual const std::string& GetContentState() const OVERRIDE; 49 virtual const std::string& GetContentState() const OVERRIDE;
48 virtual void SetPageID(int page_id) OVERRIDE; 50 virtual void SetPageID(int page_id) OVERRIDE;
49 virtual int32 GetPageID() const OVERRIDE; 51 virtual int32 GetPageID() const OVERRIDE;
50 virtual const string16& GetTitleForDisplay( 52 virtual const string16& GetTitleForDisplay(
51 const std::string& languages) const OVERRIDE; 53 const std::string& languages) const OVERRIDE;
52 virtual bool IsViewSourceMode() const OVERRIDE; 54 virtual bool IsViewSourceMode() const OVERRIDE;
53 virtual void SetTransitionType(PageTransition transition_type) OVERRIDE; 55 virtual void SetTransitionType(PageTransition transition_type) OVERRIDE;
54 virtual PageTransition GetTransitionType() const OVERRIDE; 56 virtual PageTransition GetTransitionType() const OVERRIDE;
55 virtual const GURL& GetUserTypedURL() const OVERRIDE; 57 virtual const GURL& GetUserTypedURL() const OVERRIDE;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 179
178 // See the accessors above for descriptions. 180 // See the accessors above for descriptions.
179 int unique_id_; 181 int unique_id_;
180 scoped_refptr<SiteInstanceImpl> site_instance_; 182 scoped_refptr<SiteInstanceImpl> site_instance_;
181 PageType page_type_; 183 PageType page_type_;
182 GURL url_; 184 GURL url_;
183 Referrer referrer_; 185 Referrer referrer_;
184 GURL virtual_url_; 186 GURL virtual_url_;
185 bool update_virtual_url_with_url_; 187 bool update_virtual_url_with_url_;
186 string16 title_; 188 string16 title_;
189 string16 search_terms_;
187 FaviconStatus favicon_; 190 FaviconStatus favicon_;
188 std::string content_state_; 191 std::string content_state_;
189 int32 page_id_; 192 int32 page_id_;
190 SSLStatus ssl_; 193 SSLStatus ssl_;
191 PageTransition transition_type_; 194 PageTransition transition_type_;
192 GURL user_typed_url_; 195 GURL user_typed_url_;
193 bool has_post_data_; 196 bool has_post_data_;
194 int64 post_id_; 197 int64 post_id_;
195 RestoreType restore_type_; 198 RestoreType restore_type_;
196 GURL original_request_url_; 199 GURL original_request_url_;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 // Set when this entry should be able to access local file:// resources. This 247 // Set when this entry should be able to access local file:// resources. This
245 // value is not needed after the entry commits and is not persisted. 248 // value is not needed after the entry commits and is not persisted.
246 bool can_load_local_resources_; 249 bool can_load_local_resources_;
247 250
248 // Copy and assignment is explicitly allowed for this class. 251 // Copy and assignment is explicitly allowed for this class.
249 }; 252 };
250 253
251 } // namespace content 254 } // namespace content
252 255
253 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 256 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698