3 files changed, 13 insertions, 18 deletions
diff --git a/chromium/chrome/browser/resources/uber/uber_frame.css b/chromium/chrome/browser/resources/uber/uber_frame.css
index b14b7beb2cc..36aa40d55d7 100644
--- a/chromium/chrome/browser/resources/uber/uber_frame.css
+++ b/chromium/chrome/browser/resources/uber/uber_frame.css
@@ -46,7 +46,7 @@ li.selected {
 }
 
 /* Separates the Help nav item if there are at least 3 items. */
-li:not([hidden]) ~ li:not([hidden]) ~ #helpNavItem {
+li:not([hidden]) ~ li:not([hidden]) ~ #help {
   margin-top: 27px;
 }
 
diff --git a/chromium/chrome/browser/resources/uber/uber_frame.html b/chromium/chrome/browser/resources/uber/uber_frame.html
index 7e52aae8923..9d2d99c4e1f 100644
--- a/chromium/chrome/browser/resources/uber/uber_frame.html
+++ b/chromium/chrome/browser/resources/uber/uber_frame.html
@@ -18,24 +18,22 @@
 
 <h1 i18n-content="shortProductName"></h1>
 <ul role="tablist">
-  <li i18n-values="controls:historyHost;override:overridesHistory;
-                   group:historyGroup" role="tab" class="hide-in-guest" hidden>
+  <li i18n-values="controls:historyHost;override:overridesHistory" role="tab"
+      id="history" class="hide-in-guest">
     <button class="custom-appearance"
         i18n-content="historyDisplayName"></button>
   </li>
-  <li i18n-values="controls:extensionsHost;group:extensionsGroup"
-      class="hide-in-guest" role="tab" hidden>
+  <li i18n-values="controls:extensionsHost" role="tab" id="extensions"
+      class="hide-in-guest">
     <button class="custom-appearance"
         i18n-content="extensionsDisplayName"></button>
   </li>
-  <li i18n-values="controls:settingsHost;group:settingsGroup" role="tab" hidden>
+  <li i18n-values="controls:settingsHost" role="tab" id="settings">
     <button class="custom-appearance"
         i18n-content="settingsDisplayName"></button>
   </li>
-  <li id="helpNavItem" i18n-values="controls:helpHost;group:helpGroup"
-      role="tab" hidden>
-    <button class="custom-appearance"
-        i18n-content="helpDisplayName"></button>
+  <li i18n-values="controls:helpHost" role="tab" id="help">
+    <button class="custom-appearance" i18n-content="helpDisplayName"></button>
   </li>
 </ul>
 
diff --git a/chromium/chrome/browser/resources/uber/uber_frame.js b/chromium/chrome/browser/resources/uber/uber_frame.js
index bef246caafb..1b3e967f5af 100644
--- a/chromium/chrome/browser/resources/uber/uber_frame.js
+++ b/chromium/chrome/browser/resources/uber/uber_frame.js
@@ -105,14 +105,11 @@ cr.define('uber_frame', function() {
    * Shows nav items belonging to the same group as the selected item.
    */
   function showNavItems() {
-    var navItems = document.querySelectorAll('li');
-    var selectedNavItem = getSelectedNavItem();
-    assert(selectedNavItem);
-
-    var selectedGroup = selectedNavItem.getAttribute('group');
-    for (var i = 0; i < navItems.length; ++i) {
-      navItems[i].hidden = navItems[i].getAttribute('group') != selectedGroup;
-    }
+    var hideSettingsAndHelp = loadTimeData.getBoolean('hideSettingsAndHelp');
+    $('settings').hidden = hideSettingsAndHelp;
+    $('help').hidden = hideSettingsAndHelp;
+    $('extensions').hidden = loadTimeData.getBoolean('hideExtensions');
+    $('history').hidden = loadTimeData.getBoolean('hideHistory');
   }
 
   /**