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

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: fix for Dan's comments Created 8 years, 3 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 virtual content::SessionStorageNamespace* 71 virtual content::SessionStorageNamespace*
72 GetDefaultSessionStorageNamespace() OVERRIDE; 72 GetDefaultSessionStorageNamespace() OVERRIDE;
73 virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE; 73 virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE;
74 virtual int32 GetMaxRestoredPageID() const OVERRIDE; 74 virtual int32 GetMaxRestoredPageID() const OVERRIDE;
75 virtual bool NeedsReload() const OVERRIDE; 75 virtual bool NeedsReload() const OVERRIDE;
76 virtual void CancelPendingReload() OVERRIDE; 76 virtual void CancelPendingReload() OVERRIDE;
77 virtual void ContinuePendingReload() OVERRIDE; 77 virtual void ContinuePendingReload() OVERRIDE;
78 virtual bool IsInitialNavigation() OVERRIDE; 78 virtual bool IsInitialNavigation() OVERRIDE;
79 virtual void Reload(bool check_for_repost) OVERRIDE; 79 virtual void Reload(bool check_for_repost) OVERRIDE;
80 virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE; 80 virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE;
81 virtual void ReloadOriginalRequestURL(bool check_for_repost) OVERRIDE;
sky 2012/09/07 18:05:30 Move the implementation to match new position in h
sschmitz 2012/09/07 22:33:09 Done.
sky 2012/09/07 22:54:16 I don't see this in the latest patch.
81 virtual void NotifyEntryChanged(const content::NavigationEntry* entry, 82 virtual void NotifyEntryChanged(const content::NavigationEntry* entry,
82 int index) OVERRIDE; 83 int index) OVERRIDE;
83 virtual void CopyStateFrom( 84 virtual void CopyStateFrom(
84 const content::NavigationController& source) OVERRIDE; 85 const content::NavigationController& source) OVERRIDE;
85 virtual void CopyStateFromAndPrune( 86 virtual void CopyStateFromAndPrune(
86 content::NavigationController* source) OVERRIDE; 87 content::NavigationController* source) OVERRIDE;
87 virtual void PruneAllButActive() OVERRIDE; 88 virtual void PruneAllButActive() OVERRIDE;
88 89
89 // The session storage namespace that all child RenderViews belonging to 90 // The session storage namespace that all child RenderViews belonging to
90 // |instance| should use. 91 // |instance| should use.
91 content::SessionStorageNamespace* GetSessionStorageNamespace( 92 content::SessionStorageNamespace* GetSessionStorageNamespace(
92 content::SiteInstance* instance); 93 content::SiteInstance* instance);
93 94
94 // Returns the index of the specified entry, or -1 if entry is not contained 95 // Returns the index of the specified entry, or -1 if entry is not contained
95 // in this NavigationController. 96 // in this NavigationController.
96 int GetIndexOfEntry(const content::NavigationEntryImpl* entry) const; 97 int GetIndexOfEntry(const content::NavigationEntryImpl* entry) const;
97 98
98 // Return the index of the entry with the corresponding instance and page_id, 99 // Return the index of the entry with the corresponding instance and page_id,
99 // or -1 if not found. 100 // or -1 if not found.
100 int GetEntryIndexWithPageID(content::SiteInstance* instance, 101 int GetEntryIndexWithPageID(content::SiteInstance* instance,
101 int32 page_id) const; 102 int32 page_id) const;
102 103
103 // Return the entry with the corresponding instance and page_id, or NULL if 104 // Return the entry with the corresponding instance and page_id, or NULL if
104 // not found. 105 // not found.
105 content::NavigationEntryImpl* GetEntryWithPageID( 106 content::NavigationEntryImpl* GetEntryWithPageID(
106 content::SiteInstance* instance, 107 content::SiteInstance* instance,
107 int32 page_id) const; 108 int32 page_id) const;
108 109
109 // Reloads the current entry using the original URL used to create it. This
110 // is used for cases where the user wants to refresh a page using a different
111 // user agent after following a redirect.
112 void ReloadOriginalRequestURL(bool check_for_repost);
113
114 // Transient entry ----------------------------------------------------------- 110 // Transient entry -----------------------------------------------------------
115 111
116 // Adds an entry that is returned by GetActiveEntry(). The entry is 112 // Adds an entry that is returned by GetActiveEntry(). The entry is
117 // transient: any navigation causes it to be removed and discarded. 113 // transient: any navigation causes it to be removed and discarded.
118 // The NavigationController becomes the owner of |entry| and deletes it when 114 // The NavigationController becomes the owner of |entry| and deletes it when
119 // it discards it. This is useful with interstitial page that need to be 115 // it discards it. This is useful with interstitial page that need to be
120 // represented as an entry, but should go away when the user navigates away 116 // represented as an entry, but should go away when the user navigates away
121 // from them. 117 // from them.
122 // Note that adding a transient entry does not change the active contents. 118 // Note that adding a transient entry does not change the active contents.
123 void AddTransientEntry(content::NavigationEntryImpl* entry); 119 void AddTransientEntry(content::NavigationEntryImpl* entry);
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 static size_t max_entry_count_for_testing_; 349 static size_t max_entry_count_for_testing_;
354 350
355 // If a repost is pending, its type (RELOAD or RELOAD_IGNORING_CACHE), 351 // If a repost is pending, its type (RELOAD or RELOAD_IGNORING_CACHE),
356 // NO_RELOAD otherwise. 352 // NO_RELOAD otherwise.
357 ReloadType pending_reload_; 353 ReloadType pending_reload_;
358 354
359 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); 355 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
360 }; 356 };
361 357
362 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 358 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698