Disable Uber navigation for Settings & Help overlays

chrome/browser/resources/help/help.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.
 
 <include src="../uber/uber_page_manager_observer.js">
 <include src="../uber/uber_utils.js">
 
 var ChannelChangePage = help.ChannelChangePage;
 var HelpPage = help.HelpPage;
 var PageManager = cr.ui.pageManager.PageManager;
 
 /**
  * DOMContentLoaded handler, sets up the page.
  */
 function load() {
   PageManager.register(HelpPage.getInstance());
 
   if (cr.isChromeOS) {
     PageManager.registerOverlay(ChannelChangePage.getInstance(),
                                 HelpPage.getInstance());
   }
   cr.ui.FocusManager.disableMouseFocusOnButtons();
   PageManager.addObserver(new uber.PageManagerObserver());
   PageManager.initialize(HelpPage.getInstance());
+  uber.onContentFrameLoaded();

[michaelpg, 2014/08/08 14:03:47]

I wouldn't mind updating help_browsertest.js to test this as well, but the
channel change overlay doesn't always exist (so the navigation frame won't be
disabled). Specifically, it should exist if:
m
1. we are on Linux and #defined(OS_CHROME), or
2. we are on a CrOS device and #defined(OS_CHROME) and
#defined(GOOGLE_CHROME_BUILD)

I can make a C++ test fixture to make base::SysInfo::IsRunningOnChromeOS()
available to the JS here, but want to check first if there's a simple way to do
this check.

 
   var pageName = PageManager.getPageNameFromPath();
   // Still update history so that chrome://help/nonexistant redirects
   // appropriately to chrome://help/. If the URL matches, updateHistory
   // will avoid adding the extra state.
   var updateHistory = true;
   PageManager.showPageByName(pageName, updateHistory, {replaceState: true});
-
-  uber.onContentFrameLoaded();
 }
 
 document.addEventListener('DOMContentLoaded', load);
 
 /**
  * Listener for the |beforeunload| event.
  */
 window.onbeforeunload = function() {
   PageManager.willClose();
 };
 
 /**
  * Listener for the |popstate| event.
  * @param {Event} e The |popstate| event.
  */
 window.onpopstate = function(e) {
   var pageName = PageManager.getPageNameFromPath();
   PageManager.setState(pageName, e.state);
 };