diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-02 20:50:39 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-02 20:50:39 +0000 |
commit | 40bcc30cf1b2f48a0d371c8e11220d3b5e7b850b (patch) | |
tree | 4cedafb7edbc2670a858446f5acbded0febf6d71 /chrome/browser/tab_contents/navigation_controller.cc | |
parent | 8718a105c71a6b81fb1383960dc6df8423201901 (diff) | |
download | chromium_src-40bcc30cf1b2f48a0d371c8e11220d3b5e7b850b.zip chromium_src-40bcc30cf1b2f48a0d371c8e11220d3b5e7b850b.tar.gz chromium_src-40bcc30cf1b2f48a0d371c8e11220d3b5e7b850b.tar.bz2 |
Fix compilations errors introduced by revision 10712.
TBR=deanm
Review URL: http://codereview.chromium.org/27347
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/navigation_controller.cc')
-rw-r--r-- | chrome/browser/tab_contents/navigation_controller.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc index e8ae41f..af6c73c 100644 --- a/chrome/browser/tab_contents/navigation_controller.cc +++ b/chrome/browser/tab_contents/navigation_controller.cc @@ -45,7 +45,7 @@ void NotifyPrunedEntries(NavigationController* nav_controller, // Ensure the given NavigationEntry has a valid state, so that WebKit does not // get confused if we navigate back to it. -// +// // An empty state is treated as a new navigation by WebKit, which would mean // losing the navigation entries and generating a new navigation entry after // this one. We don't want that. To avoid this we create a valid state which @@ -157,7 +157,7 @@ NavigationController::NavigationController(TabContents* contents, transient_entry_index_(-1), active_contents_(contents), max_restored_page_id_(-1), - ssl_manager_(this, NULL), + ALLOW_THIS_IN_INITIALIZER_LIST(ssl_manager_(this, NULL)), needs_reload_(false), load_pending_entry_when_active_(false) { if (contents) @@ -176,7 +176,7 @@ NavigationController::NavigationController( transient_entry_index_(-1), active_contents_(NULL), max_restored_page_id_(-1), - ssl_manager_(this, NULL), + ALLOW_THIS_IN_INITIALIZER_LIST(ssl_manager_(this, NULL)), needs_reload_(true), load_pending_entry_when_active_(false) { DCHECK(profile_); @@ -770,7 +770,7 @@ void NavigationController::RendererDidNavigateToExistingPage( // actually change any other state, just kill the pointer. if (entry == pending_entry_) DiscardNonCommittedEntriesInternal(); - + last_committed_entry_index_ = entry_index; } |