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

Unified Diff: chrome/browser/resources/options/content_settings.js

Issue 298553002: Options: maintain history entries on the parent frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More comments (try jobs on previous) Created 6 years, 7 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
Index: chrome/browser/resources/options/content_settings.js
diff --git a/chrome/browser/resources/options/content_settings.js b/chrome/browser/resources/options/content_settings.js
index 357b9eb86175f106adf455c47828b8a26747f37f..44ae39f1f8abaaa1f4bf496a5b3042988fa5c72d 100644
--- a/chrome/browser/resources/options/content_settings.js
+++ b/chrome/browser/resources/options/content_settings.js
@@ -37,17 +37,11 @@ cr.define('options', function() {
// history so back/forward and tab restore works.
var hash = event.currentTarget.getAttribute('contentType');
var url = page.name + '#' + hash;
- window.history.pushState({pageName: page.name},
- page.title,
- '/' + url);
+ uber.pushState({pageName: page.name}, url);
- // Navigate after the history has been replaced in order to have the
- // correct hash loaded.
+ // Navigate after the local history has been replaced in order to have
+ // the correct hash loaded.
OptionsPage.showPageByName('contentExceptions', false);
-
- uber.invokeMethodOnParent('setPath', {path: url});
- uber.invokeMethodOnParent('setTitle',
- {title: loadTimeData.getString(hash + 'TabTitle')});
};
}

Powered by Google App Engine
This is Rietveld 408576698