Upstream Android native crash handling changes.

chrome/browser/resources/uber/uber_frame.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.
 
 // This file contains the navigation controls that are visible on the left side
 // of the uber page. It exists separately from uber.js so that it may be loaded
 // in an iframe. Iframes can be layered on top of each other, but not mixed in
 // with page content, so all overlapping content on uber must be framed.
 
 <include src="../shared/js/util.js"></include>
@@ skipping 21 matching lines @@
    * Handles clicks on the navigation controls (switches the page and updates
    * the URL).
    * @param {Event} e The click event.
    */
   function onNavItemClicked(e) {
     // Though pointer-event: none; is applied to the .selected nav item, users
     // can still tab to them and press enter/space which simulates a click.
     if (e.target.classList.contains('selected'))
       return;
 
+    // Extensions can override Uber content (e.g., if the user has a history

[Mark Mentovai, 2012/04/09 22:55:58]

This too.

+    // extension, it should display when the 'History' navigation is clicked).
+    if (e.currentTarget.getAttribute('override') == 'yes') {
+      window.open('chrome://' + e.currentTarget.getAttribute('controls'),
+          '_blank');
+      return;
+    }
+
     uber.invokeMethodOnParent('showPage',
        {pageId: e.currentTarget.getAttribute('controls')});
 
     setSelection(e.currentTarget);
   }
 
   /**
    * Handles postMessage from chrome://chrome.
    * @param {Event} e The post data.
    */
@@ skipping 63 matching lines @@
   }
 
   /**
    * @return {Object} The currently selected iframe container.
    * @private
    */
   function getSelectedIframe() {
     return document.querySelector('.iframe-container.selected');
   }
 
+  /**
+   * Finds the <li> element whose 'controls' attribute is |controls| and sets
+   * its 'override' attribute to |override|.
+   * @param {string} controls The value of the 'controls' attribute of the
+   *     element to change.
+   * @param {string} override The value to set for the 'override' attribute of
+   *     that element (either 'yes' or 'no').
+   */
+  function setNavigationOverride(controls, override) {
+    var navItem =
+        document.querySelector('li[controls="' + controls + '"]');
+    navItem.setAttribute('override', override);
+  }
+
   return {
     onLoad: onLoad,
+    setNavigationOverride: setNavigationOverride,
   };
 
 });
 
 document.addEventListener('DOMContentLoaded', uber_frame.onLoad);