Settings: adjust history before changing the title in changePageTo.

chrome/browser/resources/uber/uber.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('uber', function() {
   /**
    * Options for how web history should be handled.
    */
   var HISTORY_STATE_OPTION = {
     PUSH: 1,    // Push a new history state.
@@ skipping 206 matching lines @@
    * @return {!HTMLElement} The frame associated to |origin| or null.
    */
   function getIframeFromOrigin(origin) {
     assert(origin.substr(-1) != '/', 'invalid origin given');
     var query = '.iframe-container > iframe[src^="' + origin + '/"]';
     return document.querySelector(query);
   }
 
   /**
    * Changes the path past the page title (i.e. chrome://chrome/settings/(.*)).
+   * @param {string} pageId Should match an id of one of the iframe containers.
    * @param {Object} state The page's state object for the navigation.
    * @param {string} path The new /path/ to be set after the page name.
    * @param {number} historyOption The type of history modification to make.
    */
-  function changePathTo(state, path, historyOption) {
+  function changePathTo(pageId, state, path, historyOption) {
     assert(!path || path.substr(-1) != '/', 'invalid path given');
 
     var histFunc;
     if (historyOption == HISTORY_STATE_OPTION.PUSH)
       histFunc = window.history.pushState;
     else if (historyOption == HISTORY_STATE_OPTION.REPLACE)
       histFunc = window.history.replaceState;
 
     assert(histFunc, 'invalid historyOption given ' + historyOption);
 
-    var pageId = getSelectedIframe().id;
     var args = [{pageId: pageId, pageState: state},
                 '',
                 '/' + pageId + '/' + (path || '')];
     histFunc.apply(window.history, args);
   }
 
   /**
    * Adds or replaces the current history entry based on a navigation from the
    * source iframe.
    * @param {string} origin The origin of the source iframe.
    * @param {Object} state The source iframe's state object.
    * @param {string} path The new "path" (e.g. "/createProfile").
    * @param {boolean} replace Whether to replace the current history entry.
    */
   function updateHistory(origin, state, path, replace) {
     assert(!path || path[0] != '/', 'invalid path sent from ' + origin);
     var historyOption =
         replace ? HISTORY_STATE_OPTION.REPLACE : HISTORY_STATE_OPTION.PUSH;
     // Only update the currently displayed path if this is the visible frame.
-    if (getIframeFromOrigin(origin).parentNode == getSelectedIframe())
-      changePathTo(state, path, historyOption);
+    var container = getIframeFromOrigin(origin).parentNode;
+    if (container == getSelectedIframe())
+      changePathTo(container.id, state, path, historyOption);
   }
 
   /**
    * Sets the title of the page.
    * @param {string} origin The origin of the source iframe.
    * @param {string} title The title of the page.
    */
   function setTitle(origin, title) {
     // Cache the title for the client iframe, i.e., the iframe setting the
     // title. querySelector returns the actual iframe element, so use parentNode
@@ skipping 59 matching lines @@
       container.appendChild(frame);
       frame.src = sourceUrl;
     } else {
       // There's no particularly good way to know what the current URL of the
       // content frame is as we don't have access to its contentWindow's
       // location, so just replace every time until necessary to do otherwise.
       frame.contentWindow.location.replace(sourceUrl);
       frame.dataset.ready = false;
     }
 
+    // This must be called before selectPage so that the title change applies to
+    // the new history entry.
+    if (historyOption != HISTORY_STATE_OPTION.NONE)
+      changePathTo(pageId, {}, path, historyOption);
+
     selectPage(pageId);
-
-    if (historyOption != HISTORY_STATE_OPTION.NONE)
-      changePathTo({}, path, historyOption);
   }
 
   /**
    * Switches to a subpage. The subpage must already exist.
    * @param {string} pageId Should match an id of one of the iframe containers.
    */
   function selectPage(pageId) {
     var container = getRequiredElement(pageId);
     var lastSelected = document.querySelector('.iframe-container.selected');
 
@@ skipping 103 matching lines @@
   }
 
   return {
     onLoad: onLoad,
     onPopHistoryState: onPopHistoryState
   };
 });
 
 window.addEventListener('popstate', uber.onPopHistoryState);
 document.addEventListener('DOMContentLoaded', uber.onLoad);