get rid of old options pages

chrome/browser/browser_about_handler.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/browser_about_handler.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 85 matching lines @@
 
   // Check that about: URLs are fixed up to chrome: by URLFixerUpper::FixupURL.
   DCHECK((*url == GURL(chrome::kAboutBlankURL)) ||
          !url->SchemeIs(chrome::kAboutScheme));
 
   // Only handle chrome://foo/, URLFixerUpper::FixupURL translates about:foo.
   // TAB_CONTENTS_WEB handles about:blank, which frames are allowed to access.
   if (!url->SchemeIs(chrome::kChromeUIScheme))
     return false;
 
-  CommandLine* cl = CommandLine::ForCurrentProcess();
-  bool enableUberPage = !cl->HasSwitch(switches::kDisableUberPage);
-
   std::string host(url->host());
   std::string path;
   // Replace about with chrome-urls.
   if (host == chrome::kChromeUIAboutHost)
     host = chrome::kChromeUIChromeURLsHost;
   // Replace cache with view-http-cache.
   if (host == chrome::kChromeUICacheHost) {
     host = chrome::kChromeUINetworkViewCacheHost;
   // Replace gpu with gpu-internals.
   } else if (host == chrome::kChromeUIGpuHost) {
     host = chrome::kChromeUIGpuInternalsHost;
   // Replace sync with sync-internals (for legacy reasons).
   } else if (host == chrome::kChromeUISyncHost) {
     host = chrome::kChromeUISyncInternalsHost;
   // Redirect chrome://extensions.
   } else if (host == chrome::kChromeUIExtensionsHost) {
-    if (enableUberPage) {
-      host = chrome::kChromeUIUberHost;
-      path = chrome::kChromeUIExtensionsHost + url->path();
-    } else {
-      host = chrome::kChromeUISettingsHost;
-      path = chrome::kExtensionsSubPage;
-    }
+    host = chrome::kChromeUIUberHost;
+    path = chrome::kChromeUIExtensionsHost + url->path();
   } else if (host == chrome::kChromeUIHistoryHost) {
-    if (enableUberPage) {
-      host = chrome::kChromeUIUberHost;
-      path = chrome::kChromeUIHistoryHost + url->path();
-    } else {
-      host = chrome::kChromeUIHistoryFrameHost;
-    }
+    host = chrome::kChromeUIUberHost;
+    path = chrome::kChromeUIHistoryHost + url->path();
   // Redirect chrome://settings/extensions.
   // TODO(csilv): Fix all code paths for this page once Uber page is enabled
   // permanently.
-  } else if (enableUberPage && host == chrome::kChromeUISettingsHost &&
+  } else if (host == chrome::kChromeUISettingsHost &&
       url->path() == std::string("/") + chrome::kExtensionsSubPage) {
     host = chrome::kChromeUIUberHost;
     path = chrome::kChromeUIExtensionsHost;
   // Redirect chrome://settings
-  } else if (enableUberPage && host == chrome::kChromeUISettingsHost) {
+  } else if (host == chrome::kChromeUISettingsHost) {
     host = chrome::kChromeUIUberHost;
     path = chrome::kChromeUISettingsHost + url->path();
   }
   GURL::Replacements replacements;
   replacements.SetHostStr(host);
   if (!path.empty())
     replacements.SetPathStr(path);
   *url = url->ReplaceComponents(replacements);
 
   // Having re-written the URL, make the chrome: handler process it.
@@ skipping 56 matching lines @@
 AboutTcmallocOutputs::AboutTcmallocOutputs() {}
 
 AboutTcmallocOutputs::~AboutTcmallocOutputs() {}
 
 // Glue between the callback task and the method in the singleton.
 void AboutTcmallocRendererCallback(base::ProcessId pid,
                                    const std::string& output) {
   AboutTcmallocOutputs::GetInstance()->RendererCallback(pid, output);
 }
 #endif