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

Unified Diff: chrome/browser/tab_contents/navigation_controller.cc

Issue 3307013: Implement the webNavigation.onCommitted event. (Closed)
Patch Set: updates Created 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extensions_service.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/navigation_controller.cc
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index a416bc954ce884314eb14e5470119ab29203baf3..0aa86f2534b2b3dbd4cdc7234c7472d707c4d929 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -352,6 +352,9 @@ void NavigationController::GoBack() {
DiscardNonCommittedEntries();
pending_entry_index_ = current_index - 1;
+ entries_[pending_entry_index_]->set_transition_type(
+ entries_[pending_entry_index_]->transition_type() |
+ PageTransition::FORWARD_BACK);
NavigateToPendingEntry(NO_RELOAD);
}
@@ -382,6 +385,9 @@ void NavigationController::GoForward() {
if (!transient)
pending_entry_index_++;
+ entries_[pending_entry_index_]->set_transition_type(
+ entries_[pending_entry_index_]->transition_type() |
+ PageTransition::FORWARD_BACK);
NavigateToPendingEntry(NO_RELOAD);
}
@@ -420,6 +426,9 @@ void NavigationController::GoToIndex(int index) {
DiscardNonCommittedEntries();
pending_entry_index_ = index;
+ entries_[pending_entry_index_]->set_transition_type(
+ entries_[pending_entry_index_]->transition_type() |
+ PageTransition::FORWARD_BACK);
NavigateToPendingEntry(NO_RELOAD);
}
« no previous file with comments | « chrome/browser/extensions/extensions_service.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698