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

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

Issue 69013004: Renamed CanPruneAllButVisible and PruneAllButVisible in the Navigation Controller to CanPruneAllBut… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed some unit tests Created 7 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 virtual bool IsInitialNavigation() const OVERRIDE; 83 virtual bool IsInitialNavigation() const OVERRIDE;
84 virtual void Reload(bool check_for_repost) OVERRIDE; 84 virtual void Reload(bool check_for_repost) OVERRIDE;
85 virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE; 85 virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE;
86 virtual void ReloadOriginalRequestURL(bool check_for_repost) OVERRIDE; 86 virtual void ReloadOriginalRequestURL(bool check_for_repost) OVERRIDE;
87 virtual void NotifyEntryChanged(const NavigationEntry* entry, 87 virtual void NotifyEntryChanged(const NavigationEntry* entry,
88 int index) OVERRIDE; 88 int index) OVERRIDE;
89 virtual void CopyStateFrom( 89 virtual void CopyStateFrom(
90 const NavigationController& source) OVERRIDE; 90 const NavigationController& source) OVERRIDE;
91 virtual void CopyStateFromAndPrune( 91 virtual void CopyStateFromAndPrune(
92 NavigationController* source) OVERRIDE; 92 NavigationController* source) OVERRIDE;
93 virtual bool CanPruneAllButVisible() OVERRIDE; 93 virtual bool CanPruneAllButLastCommitted() OVERRIDE;
94 virtual void PruneAllButVisible() OVERRIDE; 94 virtual void PruneAllButLastCommitted() OVERRIDE;
95 virtual void ClearAllScreenshots() OVERRIDE; 95 virtual void ClearAllScreenshots() OVERRIDE;
96 96
97 // The session storage namespace that all child RenderViews belonging to 97 // The session storage namespace that all child RenderViews belonging to
98 // |instance| should use. 98 // |instance| should use.
99 SessionStorageNamespace* GetSessionStorageNamespace( 99 SessionStorageNamespace* GetSessionStorageNamespace(
100 SiteInstance* instance); 100 SiteInstance* instance);
101 101
102 // Returns the index of the specified entry, or -1 if entry is not contained 102 // Returns the index of the specified entry, or -1 if entry is not contained
103 // in this NavigationController. 103 // in this NavigationController.
104 int GetIndexOfEntry(const NavigationEntryImpl* entry) const; 104 int GetIndexOfEntry(const NavigationEntryImpl* entry) const;
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 void DiscardNonCommittedEntriesInternal(); 294 void DiscardNonCommittedEntriesInternal();
295 295
296 // Discards only the transient entry. 296 // Discards only the transient entry.
297 void DiscardTransientEntry(); 297 void DiscardTransientEntry();
298 298
299 // If we have the maximum number of entries, remove the oldest one in 299 // If we have the maximum number of entries, remove the oldest one in
300 // preparation to add another. 300 // preparation to add another.
301 void PruneOldestEntryIfFull(); 301 void PruneOldestEntryIfFull();
302 302
303 // Removes all entries except the last committed entry. If there is a new 303 // Removes all entries except the last committed entry. If there is a new
304 // pending navigation it is preserved. In contrast to PruneAllButVisible() 304 // pending navigation it is preserved. In contrast to
305 // this does not update the session history of the RenderView. Callers 305 // PruneAllButLastCommitted() this does not update the session history of the
306 // must ensure that |CanPruneAllButVisible| returns true before calling this. 306 // RenderView. Callers must ensure that |CanPruneAllButLastCommitted| returns
307 void PruneAllButVisibleInternal(); 307 // true before calling this.
308 void PruneAllButLastCommittedInternal();
308 309
309 // Returns true if the navigation is likley to be automatic rather than 310 // Returns true if the navigation is likley to be automatic rather than
310 // user-initiated. 311 // user-initiated.
311 bool IsLikelyAutoNavigation(base::TimeTicks now); 312 bool IsLikelyAutoNavigation(base::TimeTicks now);
312 313
313 // Inserts up to |max_index| entries from |source| into this. This does NOT 314 // Inserts up to |max_index| entries from |source| into this. This does NOT
314 // adjust any of the members that reference entries_ 315 // adjust any of the members that reference entries_
315 // (last_committed_entry_index_, pending_entry_index_ or 316 // (last_committed_entry_index_, pending_entry_index_ or
316 // transient_entry_index_). 317 // transient_entry_index_).
317 void InsertEntriesFrom(const NavigationControllerImpl& source, int max_index); 318 void InsertEntriesFrom(const NavigationControllerImpl& source, int max_index);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 TimeSmoother time_smoother_; 399 TimeSmoother time_smoother_;
399 400
400 scoped_ptr<NavigationEntryScreenshotManager> screenshot_manager_; 401 scoped_ptr<NavigationEntryScreenshotManager> screenshot_manager_;
401 402
402 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); 403 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
403 }; 404 };
404 405
405 } // namespace content 406 } // namespace content
406 407
407 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ 408 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | content/browser/frame_host/navigation_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698