Revert 117136 - separate about page into its own page (included in chrome://chrome)

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"
@@ skipping 39 matching lines @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/options2_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/escape.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/webui/options2/chromeos/about_page_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h"
@@ skipping 158 matching lines @@
   AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
   AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler());
   AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
   AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
   AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
   AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler());
   AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler(
       g_browser_process->profile_manager()));
 #if defined(OS_CHROMEOS)
   AddOptionsPageUIHandler(localized_strings,
+                          new chromeos::options2::AboutPageHandler());
+  AddOptionsPageUIHandler(localized_strings,
                           new chromeos::options2::AccountsOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
                           new chromeos::options2::BluetoothOptionsHandler());
   AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
                           new chromeos::options2::LanguageChewingHandler());
   AddOptionsPageUIHandler(
       localized_strings,
       new chromeos::options2::LanguageCustomizeModifierKeysHandler());
   AddOptionsPageUIHandler(localized_strings,
@@ skipping 118 matching lines @@
       WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
 #else
   command_line_string =
       CommandLine::ForCurrentProcess()->GetCommandLineString();
 #endif
 
   render_view_host->SetWebUIProperty("commandLineString", command_line_string);
 }
 
 }  // namespace options2