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

chrome/browser/ui/webui/about_page/about_page_handler.h

Index: chrome/browser/ui/webui/about_page/about_page_handler.h
diff --git a/chrome/browser/ui/webui/options2/chromeos/about_page_handler2.h b/chrome/browser/ui/webui/about_page/about_page_handler.h
similarity index 65%
rename from chrome/browser/ui/webui/options2/chromeos/about_page_handler2.h
rename to chrome/browser/ui/webui/about_page/about_page_handler.h
index 6a0180284a2e9cf52c0534d1421eb0dc65bf7116..332b18f46c009ee3ded1a0151df160cb6b453f27 100644
--- a/chrome/browser/ui/webui/options2/chromeos/about_page_handler2.h
+++ b/chrome/browser/ui/webui/about_page/about_page_handler.h
@@ -2,30 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ABOUT_PAGE_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ABOUT_PAGE_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_ABOUT_PAGE_ABOUT_PAGE_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_ABOUT_PAGE_ABOUT_PAGE_HANDLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/ui/webui/options2/options_ui2.h"
 #include "chrome/browser/chromeos/dbus/update_engine_client.h"
 #include "chrome/browser/chromeos/version_loader.h"
-
-namespace chromeos {
-namespace options2 {
+#include "content/public/browser/web_ui_message_handler.h"
 
 // ChromeOS about page UI handler.
-class AboutPageHandler : public ::options2::OptionsPageUIHandler {
-
+class AboutPageHandler : public content::WebUIMessageHandler {
  public:
   AboutPageHandler();
   virtual ~AboutPageHandler();
 
-  // OptionsPageUIHandler implementation.
-  virtual void GetLocalizedValues(
-      base::DictionaryValue* localized_strings) OVERRIDE;
-  virtual void RegisterMessages() OVERRIDE;
+  void GetLocalizedValues(base::DictionaryValue* localized_strings) OVERRIDE;
+  void RegisterMessages() OVERRIDE;
 
  private:
   class UpdateObserver;
@@ -44,18 +38,18 @@ class AboutPageHandler : public ::options2::OptionsPageUIHandler {
   void RestartNow(const base::ListValue* args);
 
   // Callback from VersionLoader giving the version.
-  void OnOSVersion(VersionLoader::Handle handle,
+  void OnOSVersion(chromeos::VersionLoader::Handle handle,
                    std::string version);
-  void OnOSFirmware(VersionLoader::Handle handle,
+  void OnOSFirmware(chromeos::VersionLoader::Handle handle,
                     std::string firmware);
-  void UpdateStatus(const UpdateEngineClient::Status& status);
+  void UpdateStatus(const chromeos::UpdateEngineClient::Status& status);
 
   // UpdateEngine Callback handler.
   static void UpdateSelectedChannel(UpdateObserver* observer,
                                     const std::string& channel);
 
   // Handles asynchronously loading the version.
-  VersionLoader loader_;
+  chromeos::VersionLoader loader_;
 
   // Used to request the version.
   CancelableRequestConsumer consumer_;
@@ -70,7 +64,4 @@ class AboutPageHandler : public ::options2::OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(AboutPageHandler);
 };
 
-}  // namespace options2
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ABOUT_PAGE_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_ABOUT_PAGE_ABOUT_PAGE_HANDLER_H_