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

chrome/browser/ui/webui/uber/uber_ui.cc

Index: chrome/browser/ui/webui/uber/uber_ui.cc
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc
index 31879268d87d75aebdb046dcee0dfab372a5a67f..0264703a72b388c2c2fd2a2aeee1ad77db1b618a 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/webui/uber/uber_ui.h"
 
+#include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ -12,6 +13,7 @@
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
@@ -33,6 +35,11 @@ using content::WebContents;
 
 namespace {
 
+bool IsSettingsWindowEnabled() {

[Dan Beam, 2014/06/06 21:21:23]

why another one?!

[michaelpg, 2014/06/06 21:34:58]

you and stevenjb@ need to agree to disagree :-)

https://codereview.chromium.org/313363004/diff/1/chrome/browser/ui/settings_w...

[stevenjb, 2014/06/06 21:38:27]

This doesn't do anything interesting, it's just shorthand, no need to expose it
in a header. (It will go away with the flag anyway). If it were more than two
places I'd add a helper to chrome_switches.cc.

[Dan Beam, 2014/06/06 22:01:17]

it's fine

+  return CommandLine::ForCurrentProcess()->HasSwitch(
+      ::switches::kEnableSettingsWindow);
+}
+
 content::WebUIDataSource* CreateUberHTMLSource() {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIUberHost);
@@ -102,19 +109,27 @@ content::WebUIDataSource* CreateUberFrameHTMLSource(Profile* profile) {
   source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_NAME);
 #endif  // defined(OS_CHROMEOS)
 
+  // Group settings and help separately if settings in a window is enabled.
+  base::string16 settingsGroup(ASCIIToUTF16("settings_group"));

[Dan Beam, 2014/06/06 21:21:23]

cpp_vars_like_this

+  base::string16 otherGroup(ASCIIToUTF16(
+      IsSettingsWindowEnabled() ? "other_group" : "settings_group"));
   source->AddString("extensionsHost",
                     ASCIIToUTF16(chrome::kChromeUIExtensionsHost));
   source->AddLocalizedString("extensionsDisplayName",
                              IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE);
+  source->AddString("extensionsGroup", otherGroup);
   source->AddString("helpHost",
                     ASCIIToUTF16(chrome::kChromeUIHelpHost));
   source->AddLocalizedString("helpDisplayName", IDS_HELP_TITLE);
+  source->AddString("helpGroup", settingsGroup);
   source->AddString("historyHost",
                     ASCIIToUTF16(chrome::kChromeUIHistoryHost));
   source->AddLocalizedString("historyDisplayName", IDS_HISTORY_TITLE);
+  source->AddString("historyGroup", otherGroup);
   source->AddString("settingsHost",
                     ASCIIToUTF16(chrome::kChromeUISettingsHost));
   source->AddLocalizedString("settingsDisplayName", IDS_SETTINGS_TITLE);
+  source->AddString("settingsGroup", settingsGroup);
   bool overridesHistory = HasExtensionType(profile,
       chrome::kChromeUIHistoryHost);
   source->AddString("overridesHistory",