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

chrome/browser/ui/webui/options2/options_ui2.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/options2/options_ui2.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h"
 #include "chrome/browser/ui/webui/options/stop_syncing_handler.h"
-#include "chrome/browser/ui/webui/options2/advanced_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/autofill_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/clear_browser_data_handler2.h"
 #include "chrome/browser/ui/webui/options2/content_settings_handler2.h"
 #include "chrome/browser/ui/webui/options2/cookies_view_handler2.h"
 #include "chrome/browser/ui/webui/options2/core_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/font_settings_handler2.h"
 #include "chrome/browser/ui/webui/options2/handler_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/import_data_handler2.h"
 #include "chrome/browser/ui/webui/options2/language_options_handler2.h"
@@ skipping 130 matching lines @@
 
   CoreOptionsHandler* core_handler;
 #if defined(OS_CHROMEOS)
   core_handler = new chromeos::options2::CoreChromeOSOptionsHandler();
 #else
   core_handler = new CoreOptionsHandler();
 #endif
   core_handler->set_handlers_host(this);
   AddOptionsPageUIHandler(localized_strings, core_handler);
 
-  AddOptionsPageUIHandler(localized_strings, new AdvancedOptionsHandler());
   AddOptionsPageUIHandler(localized_strings, new AutofillOptionsHandler());
   AddOptionsPageUIHandler(localized_strings, new BrowserOptionsHandler());
   AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
   AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
   AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());
   AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
   AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler());
 #if defined(OS_CHROMEOS)
   AddOptionsPageUIHandler(localized_strings,
                           new chromeos::options2::CrosLanguageOptionsHandler());
@@ skipping 131 matching lines @@
       WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
 #else
   command_line_string =
       CommandLine::ForCurrentProcess()->GetCommandLineString();
 #endif
 
   render_view_host->SetWebUIProperty("commandLineString", command_line_string);
 }
 
 }  // namespace options2