The |isMainContent| parameter to HandleLoadEnd should be true for reloads (issue #183).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@181 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-02-01 16:52:32 +00:00
parent 7cd53aea4d
commit 5911e7027c
4 changed files with 47 additions and 8 deletions

View File

@@ -105,7 +105,8 @@ void BrowserNavigationController::LoadEntry(BrowserNavigationEntry* entry) {
}
BrowserNavigationEntry* BrowserNavigationController::GetLastCommittedEntry() const {
BrowserNavigationEntry* BrowserNavigationController::GetLastCommittedEntry()
const {
if (last_committed_entry_index_ == -1)
return NULL;
return entries_[last_committed_entry_index_].get();
@@ -139,7 +140,8 @@ BrowserNavigationEntry* BrowserNavigationController::GetEntryWithPageID(
return (index != -1) ? entries_[index].get() : NULL;
}
void BrowserNavigationController::DidNavigateToEntry(BrowserNavigationEntry* entry) {
void BrowserNavigationController::DidNavigateToEntry(
BrowserNavigationEntry* entry) {
// If the entry is that of a page with PageID larger than any this Tab has
// seen before, then consider it a new navigation.
if (entry->GetPageID() > GetMaxPageID()) {
@@ -218,7 +220,8 @@ int BrowserNavigationController::GetEntryIndexWithPageID(int32 page_id) const {
return -1;
}
void BrowserNavigationController::NavigateToPendingEntry(bool reload, bool ignoreCache) {
void BrowserNavigationController::NavigateToPendingEntry(bool reload,
bool ignoreCache) {
// For session history navigations only the pending_entry_index_ is set.
if (!pending_entry_) {
DCHECK(pending_entry_index_ != -1);