Options: maintain history entries on the parent frame.

chrome/browser/resources/options/content_settings.js

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')});

[davidben, 2014/05/19 22:38:33]

The setTitle call is replaced by the ContentSettingsExceptionArea updating
this.title as appropriate; right now the title isn't updated correctly if you
navigate to chrome://settings/contentExceptions#images directly.

         };
       }