diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-05 02:12:14 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-05 02:12:14 +0000 |
| commit | bac02525e778fff8779b12076a0851e971f21ef6 (patch) | |
| tree | 9689d5e88ada4e7b3bada33808a7df5276f5f4fd /chrome/browser/resources | |
| parent | a1cb2cdefd0aabd32581017079fc56eafe369756 (diff) | |
| download | chromium_src-bac02525e778fff8779b12076a0851e971f21ef6.zip chromium_src-bac02525e778fff8779b12076a0851e971f21ef6.tar.gz chromium_src-bac02525e778fff8779b12076a0851e971f21ef6.tar.bz2 | |
Fix history of tabbed options again
r73704 broke it slightly (the wrong page was getting pushed into history). To make it more fullproof, I'm reverting it back to the argument-less pushHistoryState_().
BUG=none
TEST=manual
Review URL: http://codereview.chromium.org/6410103
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
| -rw-r--r-- | chrome/browser/resources/options/options_page.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/resources/options/options_page.js b/chrome/browser/resources/options/options_page.js index fa939ae..376b101 100644 --- a/chrome/browser/resources/options/options_page.js +++ b/chrome/browser/resources/options/options_page.js @@ -69,7 +69,7 @@ cr.define('options', function() { window.history.replaceState( {pageName: page.name}, page.title, '/' + page.name); } else if (visiblePage.name != pageName) { - this.pushHistoryState_(visiblePage); + this.pushHistoryState_(); } }; @@ -131,7 +131,8 @@ cr.define('options', function() { * @param {Object} page The page to push onto the history stack. * @private */ - OptionsPage.pushHistoryState_ = function(page) { + OptionsPage.pushHistoryState_ = function() { + var page = this.getTopmostVisiblePage(); window.history.pushState({pageName: page.name}, page.title, '/' + page.name); }; @@ -212,7 +213,7 @@ cr.define('options', function() { if (topPage && topPage.parentPage) topPage.visible = false; - this.pushHistoryState_(topPage); + this.pushHistoryState_(); }; /** @@ -226,7 +227,7 @@ cr.define('options', function() { topPage = topPage.parentPage; } - this.pushHistoryState_(topPage); + this.pushHistoryState_(); }; /** |