Disable Uber navigation for Settings & Help overlays

chrome/browser/resources/help/help.js

Index: chrome/browser/resources/help/help.js
diff --git a/chrome/browser/resources/help/help.js b/chrome/browser/resources/help/help.js
index 7d2c52c9736f2e6e8147bb897cd88e33e38dbf19..e6c3f15f4cb2034a988490cb2930c6e5cb054514 100644
--- a/chrome/browser/resources/help/help.js
+++ b/chrome/browser/resources/help/help.js
@@ -22,6 +22,7 @@ function load() {
   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
@@ -29,8 +30,6 @@ function load() {
   // will avoid adding the extra state.
   var updateHistory = true;
   PageManager.showPageByName(pageName, updateHistory, {replaceState: true});
-
-  uber.onContentFrameLoaded();
 }
 
 document.addEventListener('DOMContentLoaded', load);