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

chrome/browser/browser_about_handler.cc

 // 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 "chrome/browser/browser_about_handler.h"
 
 #include <string>
 
 #include "base/logging.h"
 #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"
 
 bool WillHandleBrowserAboutURL(GURL* url,
                                content::BrowserContext* browser_context) {
   // TODO(msw): Eliminate "about:*" constants and literals from code and tests,
   //            then hopefully we can remove this forced fixup.
   *url = url_fixer::FixupURL(url->possibly_invalid_spec(), std::string());
 
   // Check that about: URLs are fixed up to chrome: by url_fixer::FixupURL.
@@ skipping 29 matching lines @@
 #if defined(OS_ANDROID)
     // On Android, redirect directly to chrome://history-frame since
     // uber page is unsupported.
     host = chrome::kChromeUIHistoryFrameHost;
 #else
     host = chrome::kChromeUIUberHost;
     path = chrome::kChromeUIHistoryHost + url->path();
 #endif
   // Redirect chrome://settings
   } else if (host == chrome::kChromeUISettingsHost) {
-    host = chrome::kChromeUIUberHost;
-    path = chrome::kChromeUISettingsHost + url->path();
+    if (::switches::AboutInSettingsEnabled()) {
+      host = chrome::kChromeUISettingsFrameHost;

[michaelpg, 2014/08/07 08:17:07]

So, this makes chrome://settings load the settings frame standalone, but the URL
in the omnibox changes back to "chrome://settings-frame" when you update the
history state. This doesn't really matter since the page should be opened in a
window, but I'm not sure why we can't just make "chrome://settings" point to
what "chrome://settings-frame" normally points to.

[michaelpg, 2014/08/07 19:33:48]

I think I'm being dumb, since we're loading resources from
chrome://settings-frame in the options page we should keep the host as
kChromeUISettingsFrameHost as it is here. So ignore these comments I think.

+    } 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() == std::string("/"))

[Dan Beam, 2014/08/07 22:36:16]

why do you need std::string()?

[michaelpg, 2014/08/08 01:10:46]

Done.

+        path = chrome::kChromeUIHelpHost;
+    } else {
+      host = chrome::kChromeUIUberHost;
+      path = chrome::kChromeUIHelpHost + url->path();
+    }
   }
 
   GURL::Replacements replacements;
   replacements.SetHostStr(host);
   if (!path.empty())
     replacements.SetPathStr(path);
   *url = url->ReplaceComponents(replacements);
 
   // Having re-written the URL, make the chrome: handler process it.
   return false;
@@ skipping 22 matching lines @@
     // Run the dialog. This will re-use the existing one if it's already up.
     chrome::ShowAboutIPCDialog();
     return true;
   }
 #endif
 
 #endif  // OFFICIAL_BUILD
 
   return false;
 }