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

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index e22e7636c086d41f7adb93bc3eb49ed847a64a64..39c04005ad3e475b521e9557837ec6df91b50321 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -201,6 +201,10 @@ const char kDiagnosticsFormat[]             = "diagnostics-format";
 // Tells the diagnostics mode to do the requested recovery step(s).
 const char kDiagnosticsRecovery[]           = "diagnostics-recovery";
 
+// When kEnableSettingsWindow is used, About is shown as an overlay in Settings
+// instead of as a separate page, unless this flag is specified.
+const char kDisableAboutInSettings[]         = "disable-about-in-settings";

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

line up = with others

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

Done, forgot to re-align when I changed it from "enable" to "disable"

+
 // Disables the experimental Answers in Suggest feature.
 const char kDisableAnswersInSuggest[]       = "disable-answers-in-suggest";
 
@@ -1367,6 +1371,12 @@ const char kDebugPrint[] = "debug-print";
 const char kFileManagerExtensionPath[]      = "filemgr-ext-path";
 #endif
 
+bool AboutInSettingsEnabled() {
+  return SettingsWindowEnabled() &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          ::switches::kDisableAboutInSettings);
+}
+
 bool SettingsWindowEnabled() {
 #if defined(OS_CHROMEOS)
   return !CommandLine::ForCurrentProcess()->HasSwitch(