summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-26 17:48:15 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-26 17:48:15 +0000
commit0adde51b660830011c3e083e31142c59d61ed349 (patch)
treef72f8ef48c494d917e09df5c55241ad1f3b305ff /chrome
parentb88aee96a27ed23d27a2d9f4d0a8b38283065b7b (diff)
downloadchromium_src-0adde51b660830011c3e083e31142c59d61ed349.zip
chromium_src-0adde51b660830011c3e083e31142c59d61ed349.tar.gz
chromium_src-0adde51b660830011c3e083e31142c59d61ed349.tar.bz2
Small tweak to avoid pushing overlay URLs. This prevents overlays URLs from getting put into
browser history. BUG=none TEST=Exercise overlays in dom-ui options window via --enable-tabbed-options. Review URL: http://codereview.chromium.org/3017027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resources/options/options_page.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/resources/options/options_page.js b/chrome/browser/resources/options/options_page.js
index 9550031..e497d91 100644
--- a/chrome/browser/resources/options/options_page.js
+++ b/chrome/browser/resources/options/options_page.js
@@ -146,13 +146,14 @@ OptionsPage.prototype = {
return;
if (visible) {
- window.history.pushState({pageName: this.name},
- this.title,
- '/' + this.name);
this.pageDiv.style.display = 'block';
if (this.isOverlay) {
var overlay = $('overlay');
overlay.classList.remove('hidden');
+ } else {
+ window.history.pushState({pageName: this.name},
+ this.title,
+ '/' + this.name);
}
if (this.tab) {
this.tab.classList.add('navbar-item-selected');