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

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

Index: chrome/browser/ui/webui/about_page/about_page_handler.cc
diff --git a/chrome/browser/ui/webui/options2/chromeos/about_page_handler2.cc b/chrome/browser/ui/webui/about_page/about_page_handler.cc
similarity index 95%
rename from chrome/browser/ui/webui/options2/chromeos/about_page_handler2.cc
rename to chrome/browser/ui/webui/about_page/about_page_handler.cc
index de472c81c17fd8c89c43e59535a41bbb0dfcd108..0aef68c36314cd6bbe9ebd963c2310ec5302e0de 100644
--- a/chrome/browser/ui/webui/options2/chromeos/about_page_handler2.cc
+++ b/chrome/browser/ui/webui/about_page/about_page_handler.cc
@@ -2,7 +2,7 @@
 // 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/chromeos/about_page_handler2.h"
+#include "chrome/browser/ui/webui/about_page/about_page_handler.h"
 
 #include <vector>
 
@@ -24,6 +24,7 @@
 #include "chrome/browser/google/google_util.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/webui/web_ui.h"
 #include "content/public/common/content_client.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
@@ -59,8 +60,11 @@ std::string StringSubRange(const std::string& text, size_t start,
 
 }  // namespace
 
-namespace chromeos {
-namespace options2 {
+using chromeos::DBusThreadManager;
+using chromeos::UpdateEngineClient;
+using chromeos::UserManager;
+using chromeos::VersionLoader;
+using chromeos::WizardController;
 
 class AboutPageHandler::UpdateObserver
     : public UpdateEngineClient::Observer {
@@ -84,8 +88,8 @@ class AboutPageHandler::UpdateObserver
 AboutPageHandler::AboutPageHandler()
     : progress_(-1),
       sticky_(false),
-      started_(false)
-{}
+      started_(false) {
+}
 
 AboutPageHandler::~AboutPageHandler() {
   if (update_observer_.get()) {
@@ -96,8 +100,15 @@ AboutPageHandler::~AboutPageHandler() {
 
 void AboutPageHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
+  DCHECK(localized_strings->empty());

[Dan Beam, 2012/01/10 00:33:39]

Super, thanks!

+
+  struct L10nResources {
+    const char* name;
+    int ids;
+  };
 
-  static OptionsStringResource resources[] = {
+  static L10nResources resources[] = {
+    { "pageTitle", IDS_ABOUT_TAB_TITLE },
     { "firmware", IDS_ABOUT_PAGE_FIRMWARE },
     { "product", IDS_PRODUCT_OS_NAME },
     { "os", IDS_PRODUCT_OS_NAME },
@@ -120,8 +131,10 @@ void AboutPageHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
     { "command_line", IDS_ABOUT_VERSION_COMMAND_LINE },
   };
 
-  RegisterStrings(localized_strings, resources, arraysize(resources));
-  RegisterTitle(localized_strings, "aboutPage", IDS_ABOUT_TAB_TITLE);
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) {
+    localized_strings->SetString(resources[i].name,
+                                 l10n_util::GetStringUTF16(resources[i].ids));
+  }
 
   // browser version
 
@@ -416,6 +429,3 @@ void AboutPageHandler::UpdateSelectedChannel(UpdateObserver* observer,
         "AboutPage.updateSelectedOptionCallback", *channel_string);
   }
 }
-
-}  // namespace options2
-}  // namespace chromeos