Integrate About page into Settings for Chrome OS settings in a window.

This is the last patch to get the About overlay showing in the Settings page
on Chrome OS when Settings in a window is enabled, so that we can hide the
uber navigation frame and truly display Settings in its own window.

BUG=379348
R=dbeam@chromium.org,ben@chromium.org

ben: please review:
    chrome/browser/browser_about_handler.cc
i hope i'm not doing anything blasphemous here!

Review URL: https://codereview.chromium.org/449623003

Cr-Commit-Position: refs/heads/master@{#289613}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289613 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 4 deletions

diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 7878b25..c747986 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -10,6 +10,7 @@
 #include "base/strings/string_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/browser_dialogs.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "components/url_fixer/url_fixer.h"
 
@@ -59,12 +60,22 @@ bool WillHandleBrowserAboutURL(GURL* url,
 #endif
   // Redirect chrome://settings
   } else if (host == chrome::kChromeUISettingsHost) {
-    host = chrome::kChromeUIUberHost;
-    path = chrome::kChromeUISettingsHost + url->path();
+    if (::switches::AboutInSettingsEnabled()) {
+      host = chrome::kChromeUISettingsFrameHost;
+    } else {
+      host = chrome::kChromeUIUberHost;
+      path = chrome::kChromeUISettingsHost + url->path();
+    }
   // Redirect chrome://help
   } else if (host == chrome::kChromeUIHelpHost) {
-    host = chrome::kChromeUIUberHost;
-    path = chrome::kChromeUIHelpHost + url->path();
+    if (::switches::AboutInSettingsEnabled()) {
+      host = chrome::kChromeUISettingsFrameHost;
+      if (url->path().empty() || url->path() == "/")
+        path = chrome::kChromeUIHelpHost;
+    } else {
+      host = chrome::kChromeUIUberHost;
+      path = chrome::kChromeUIHelpHost + url->path();
+    }
   }
 
   GURL::Replacements replacements;