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

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

Issue 10827146: crbug.com/127841 - Request Tablet Site on CB with touch screen. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: use ReloadOriginalRequestURL instead of Reload; impl. review comments from sky Created 8 years, 4 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_CONTROLLER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/linked_ptr.h" 10 #include "base/memory/linked_ptr.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 virtual content::SessionStorageNamespace* 90 virtual content::SessionStorageNamespace*
91 GetSessionStorageNamespace() const OVERRIDE; 91 GetSessionStorageNamespace() const OVERRIDE;
92 virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE; 92 virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE;
93 virtual int32 GetMaxRestoredPageID() const OVERRIDE; 93 virtual int32 GetMaxRestoredPageID() const OVERRIDE;
94 virtual bool NeedsReload() const OVERRIDE; 94 virtual bool NeedsReload() const OVERRIDE;
95 virtual void CancelPendingReload() OVERRIDE; 95 virtual void CancelPendingReload() OVERRIDE;
96 virtual void ContinuePendingReload() OVERRIDE; 96 virtual void ContinuePendingReload() OVERRIDE;
97 virtual bool IsInitialNavigation() OVERRIDE; 97 virtual bool IsInitialNavigation() OVERRIDE;
98 virtual void Reload(bool check_for_repost) OVERRIDE; 98 virtual void Reload(bool check_for_repost) OVERRIDE;
99 virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE; 99 virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE;
100 virtual void ReloadOriginalRequestURL(bool check_for_repost) OVERRIDE;
100 virtual void NotifyEntryChanged(const content::NavigationEntry* entry, 101 virtual void NotifyEntryChanged(const content::NavigationEntry* entry,
101 int index) OVERRIDE; 102 int index) OVERRIDE;
102 virtual void CopyStateFrom( 103 virtual void CopyStateFrom(
103 const content::NavigationController& source) OVERRIDE; 104 const content::NavigationController& source) OVERRIDE;
104 virtual void CopyStateFromAndPrune( 105 virtual void CopyStateFromAndPrune(
105 content::NavigationController* source) OVERRIDE; 106 content::NavigationController* source) OVERRIDE;
106 virtual void PruneAllButActive() OVERRIDE; 107 virtual void PruneAllButActive() OVERRIDE;
107 108
108 // NavigationControllerWebView implementation. 109 // NavigationControllerWebView implementation.
109 virtual void LoadDataWithBaseURL( 110 virtual void LoadDataWithBaseURL(
(...skipping 15 matching lines...) Expand all
125 // or -1 if not found. 126 // or -1 if not found.
126 int GetEntryIndexWithPageID(content::SiteInstance* instance, 127 int GetEntryIndexWithPageID(content::SiteInstance* instance,
127 int32 page_id) const; 128 int32 page_id) const;
128 129
129 // Return the entry with the corresponding instance and page_id, or NULL if 130 // Return the entry with the corresponding instance and page_id, or NULL if
130 // not found. 131 // not found.
131 content::NavigationEntryImpl* GetEntryWithPageID( 132 content::NavigationEntryImpl* GetEntryWithPageID(
132 content::SiteInstance* instance, 133 content::SiteInstance* instance,
133 int32 page_id) const; 134 int32 page_id) const;
134 135
135 // Reloads the current entry using the original URL used to create it. This
136 // is used for cases where the user wants to refresh a page using a different
137 // user agent after following a redirect.
138 void ReloadOriginalRequestURL(bool check_for_repost);
139
140 // Transient entry ----------------------------------------------------------- 136 // Transient entry -----------------------------------------------------------
141 137
142 // Adds an entry that is returned by GetActiveEntry(). The entry is 138 // Adds an entry that is returned by GetActiveEntry(). The entry is
143 // transient: any navigation causes it to be removed and discarded. 139 // transient: any navigation causes it to be removed and discarded.
144 // The NavigationController becomes the owner of |entry| and deletes it when 140 // The NavigationController becomes the owner of |entry| and deletes it when
145 // it discards it. This is useful with interstitial page that need to be 141 // it discards it. This is useful with interstitial page that need to be
146 // represented as an entry, but should go away when the user navigates away 142 // represented as an entry, but should go away when the user navigates away
147 // from them. 143 // from them.
148 // Note that adding a transient entry does not change the active contents. 144 // Note that adding a transient entry does not change the active contents.
149 void AddTransientEntry(content::NavigationEntryImpl* entry); 145 void AddTransientEntry(content::NavigationEntryImpl* entry);
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 static size_t max_entry_count_for_testing_; 347 static size_t max_entry_count_for_testing_;
352 348
353 // If a repost is pending, its type (RELOAD or RELOAD_IGNORING_CACHE), 349 // If a repost is pending, its type (RELOAD or RELOAD_IGNORING_CACHE),
354 // NO_RELOAD otherwise. 350 // NO_RELOAD otherwise.
355 ReloadType pending_reload_; 351 ReloadType pending_reload_;
356 352
357 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); 353 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
358 }; 354 };
359 355
360 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 356 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698