Start removing deprecated Options UI code

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/uber/uber_ui.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 61 matching lines @@
 
   // TODO(jhawkins): Attempt to get rid of IDS_SHORT_PRODUCT_OS_NAME.
 #if defined(OS_CHROMEOS)
   source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_OS_NAME);
 #else
   source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_NAME);
 #endif  // defined(OS_CHROMEOS)
 
   source->AddBoolean("hideExtensions",
       base::FeatureList::IsEnabled(features::kMaterialDesignExtensions));
-  source->AddBoolean("hideSettingsAndHelp",
-      ::switches::SettingsWindowEnabled() ||
-      base::FeatureList::IsEnabled(features::kMaterialDesignSettings));
+  // TODO(dbeam): remove hideSettingsAndHelp soon.
+  source->AddBoolean("hideSettingsAndHelp", true);
   source->AddString("extensionsHost", chrome::kChromeUIExtensionsHost);
   source->AddLocalizedString("extensionsDisplayName",
                              IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE);
   source->AddString("helpHost", chrome::kChromeUIHelpHost);
   source->AddLocalizedString("helpDisplayName", IDS_ABOUT_TITLE);
   source->AddString("settingsHost", chrome::kChromeUISettingsHost);
   source->AddLocalizedString("settingsDisplayName", IDS_SETTINGS_TITLE);
 
   source->DisableDenyXFrameOptions();
   source->OverrideContentSecurityPolicyChildSrc("child-src chrome:;");
@@ skipping 83 matching lines @@
 
 UberFrameUI::UberFrameUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   content::BrowserContext* browser_context =
       web_ui->GetWebContents()->GetBrowserContext();
   content::WebUIDataSource::Add(browser_context,
                                 CreateUberFrameHTMLSource(browser_context));
 }
 
 UberFrameUI::~UberFrameUI() {
 }