[uber page] Merge advanced options page into browser options.

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 2458 matching lines @@
       NotifyScreenLockRequested();
 }
 
 void Browser::Shutdown() {
   content::RecordAction(UserMetricsAction("Shutdown"));
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RequestShutdown();
 }
 
 void Browser::OpenAdvancedOptionsDialog() {
+  // TODO(csilv): The main purpose of this method is to expose the date & time
+  // settings from the clock. Simply showing the options tab not quite enough.
   content::RecordAction(UserMetricsAction("OpenSystemOptionsDialog"));
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableUberPage))
     ShowOptionsTab(chrome::kSystemOptionsSubPage);
   else
-    ShowOptionsTab(chrome::kAdvancedOptionsSubPage);
+    ShowOptionsTab("");
 }
 
 void Browser::OpenInternetOptionsDialog() {
   content::RecordAction(UserMetricsAction("OpenInternetOptionsDialog"));
   ShowOptionsTab(chrome::kInternetOptionsSubPage);
 }
 
 void Browser::OpenLanguageOptionsDialog() {
   content::RecordAction(UserMetricsAction("OpenLanguageOptionsDialog"));
   ShowOptionsTab(chrome::kLanguageOptionsSubPage);
@@ skipping 3114 matching lines @@
     ShowSingletonTabOverwritingNTP(params);
   } else {
     LoginUIServiceFactory::GetForProfile(
         profile()->GetOriginalProfile())->ShowLoginUI();
   }
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
 }