Separate Settings and Help from History and Extensions when settings-in-

chrome/browser/ui/settings_window_manager.h

Index: chrome/browser/ui/settings_window_manager.h
diff --git a/chrome/browser/ui/settings_window_manager.h b/chrome/browser/ui/settings_window_manager.h
index 16eca892303e10183fe7468bc4b367a3cf93648f..867ba5f113635141b4b448836f1834bf1742be02 100644
--- a/chrome/browser/ui/settings_window_manager.h
+++ b/chrome/browser/ui/settings_window_manager.h
@@ -20,6 +20,8 @@ namespace chrome {
 
 class SettingsWindowManagerObserver;
 
+bool SettingsWindowEnabled();

[stevenjb, 2014/06/05 21:59:05]

I wouldn't expose this here, I would just create a local function in whatever
.cc file needs it.

[sky, 2014/06/05 23:48:45]

And name it IsSettingsWindowEnabled.

[michaelpg, 2014/06/06 21:09:49]

Done. (uber_ui.cc, chrome_pages.cc)

+
 // Class for managing settings windows when --enable-settings-window is enabled.
 // TODO(stevenjb): Remove flag comment if enabled by default.
 
@@ -30,7 +32,7 @@ class SettingsWindowManager {
   void AddObserver(SettingsWindowManagerObserver* observer);
   void RemoveObserver(SettingsWindowManagerObserver* observer);
 
-  // Shows a chrome:// page (e.g. Settings, History) in an an existing system
+  // Shows a chrome:// page (e.g. Settings, Help) in an an existing system
   // Browser window for |profile| or creates a new one.
   void ShowChromePageForProfile(Profile* profile, const GURL& gurl);