Avoid js exception in history.pushState by not changing url.

Also added a missing OptionsPage.setState call.

BUG=none
TEST=OptionsPage should work as expected when switching tabs and users/network list should be populated properly.

Review URL: http://codereview.chromium.org/3074007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54017 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 2 deletions

diff --git a/chrome/browser/resources/options/options_page.js b/chrome/browser/resources/options/options_page.js
index e497d91..c1b2597 100644
--- a/chrome/browser/resources/options/options_page.js
+++ b/chrome/browser/resources/options/options_page.js
@@ -114,6 +114,16 @@ OptionsPage.registerOverlay = function(page) {
 };
 
 /**
+ * Callback for window.onpopstate.
+ * @param {Object} data State data pushed into history.
+ */
+OptionsPage.setState = function(data) {
+  if (data && data.pageName) {
+    OptionsPage.showPageByName(data.pageName);
+  }
+};
+
+/**
  * Initializes the complete options page.  This will cause
  * all C++ handlers to be invoked to do final setup.
  */
@@ -151,9 +161,9 @@ OptionsPage.prototype = {
         var overlay = $('overlay');
         overlay.classList.remove('hidden');
       } else {
+        // Recent webkit change no longer allows url change from "chrome://".
         window.history.pushState({pageName: this.name},
-                                 this.title,
-                                 '/' + this.name);
+                                 this.title);
       }
       if (this.tab) {
         this.tab.classList.add('navbar-item-selected');