[uber page] Fix url handling for uber-page sub-paths.

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 = {
@@ skipping 10 matching lines @@
   */
   var navFrame;
 
   /**
    * Handles page initialization.
    */
   function onLoad(e) {
     // If the pathname points to a sub-page, we may need to alter the location
     // of one of the frames.
     var params = resolvePageInfoFromPath(window.location.pathname);
     if (params.path) {

[Evan Stade, 2012/01/31 22:58:49]

can you move this block to after showPage instead?

[csilv, 2012/02/01 00:10:49]

Done.

       var iframe = $(params.id).querySelector('iframe');
+      iframe.src = iframe.dataset.url;
       iframe.contentWindow.location.replace(iframe.src + params.path);
     }
 
     navFrame = $('navigation');
 
     // Select a page based on the page-URL.
     showPage(params.id, HISTORY_STATE_OPTION.REPLACE);
 
     window.addEventListener('message', handleWindowMessage);
     window.setTimeout(function() {
@@ skipping 209 matching lines @@
 
   return {
     onLoad: onLoad,
     onPopHistoryState: onPopHistoryState
   };
 
 });
 
 window.addEventListener('popstate', uber.onPopHistoryState);
 document.addEventListener('DOMContentLoaded', uber.onLoad);