summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 11:20:36 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 11:20:36 +0000
commitf71a3296f11647fe0acfa632daeb5efe852e2cdd (patch)
treef2ad3dba76836121567d7c39bd732537068824ee /chrome/browser/tab_contents
parentc65f07debbaf0dde8de015591cb6386f0859b1a8 (diff)
downloadchromium_src-f71a3296f11647fe0acfa632daeb5efe852e2cdd.zip
chromium_src-f71a3296f11647fe0acfa632daeb5efe852e2cdd.tar.gz
chromium_src-f71a3296f11647fe0acfa632daeb5efe852e2cdd.tar.bz2
Implement the webNavigation.onCommitted event.
BUG=50943 TEST=ExtensionApiTest.WebNavigationEvents Review URL: http://codereview.chromium.org/3369007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/navigation_controller.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index a416bc9..0aa86f2 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);
}