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

chrome/browser/ui/settings_window_manager.cc

Index: chrome/browser/ui/settings_window_manager.cc
diff --git a/chrome/browser/ui/settings_window_manager.cc b/chrome/browser/ui/settings_window_manager.cc
index fa00fed7db209ca87bc1ff59c2b10cc15bb623f2..c3ee36adbf7d74caf3e561eb957aa3e28231bb31 100644
--- a/chrome/browser/ui/settings_window_manager.cc
+++ b/chrome/browser/ui/settings_window_manager.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/settings_window_manager.h"
 
+#include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -12,12 +13,18 @@
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/settings_window_manager_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 namespace chrome {
 
+bool SettingsWindowEnabled() {
+  return CommandLine::ForCurrentProcess()->HasSwitch(
+      ::switches::kEnableSettingsWindow);
+}
+
 // static
 SettingsWindowManager* SettingsWindowManager::GetInstance() {
   return Singleton<SettingsWindowManager>::get();