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

Unified Diff: content/browser/tab_contents/navigation_controller.h

Issue 8895010: Remove static initialization from navigation_controller.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/tab_contents/navigation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/navigation_controller.h
diff --git a/content/browser/tab_contents/navigation_controller.h b/content/browser/tab_contents/navigation_controller.h
index a5c5a9c8f1e744eb9d2e482f571fb9556bcc2f0a..34b133b6830d1358f51e80df77baf71f10344b40 100644
--- a/content/browser/tab_contents/navigation_controller.h
+++ b/content/browser/tab_contents/navigation_controller.h
@@ -336,9 +336,9 @@ class CONTENT_EXPORT NavigationController {
// Maximum number of entries before we start removing entries from the front.
static void set_max_entry_count_for_testing(size_t max_entry_count) {
- max_entry_count_ = max_entry_count;
+ max_entry_count_for_testing_ = max_entry_count;
}
- static size_t max_entry_count() { return max_entry_count_; }
+ static size_t max_entry_count();
// Cancels a repost that brought up a warning.
void CancelPendingReload();
@@ -501,7 +501,7 @@ class CONTENT_EXPORT NavigationController {
static bool check_for_repost_;
// The maximum number of entries that a navigation controller can store.
- static size_t max_entry_count_;
+ static size_t max_entry_count_for_testing_;
// If a repost is pending, its type (RELOAD or RELOAD_IGNORING_CACHE),
// NO_RELOAD otherwise.
« no previous file with comments | « no previous file | content/browser/tab_contents/navigation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698