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

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

 // Copyright (c) 2011 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/chromeos/about_page_handler2.h"
+#include "chrome/browser/ui/webui/about_page/about_page_handler.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/dbus/update_engine_client.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #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"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
 #include "webkit/glue/user_agent.h"
@@ skipping 15 matching lines @@
 
 // Returns a substring [start, end) from |text|.
 std::string StringSubRange(const std::string& text, size_t start,
                            size_t end) {
   DCHECK(end > start);
   return text.substr(start, end - 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 {
  public:
   explicit UpdateObserver(AboutPageHandler* handler) : page_handler_(handler) {}
   virtual ~UpdateObserver() {}
 
   AboutPageHandler* page_handler() const { return page_handler_; }
 
  private:
   virtual void UpdateStatusChanged(
       const UpdateEngineClient::Status& status) OVERRIDE {
     page_handler_->UpdateStatus(status);
   }
 
   AboutPageHandler* page_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateObserver);
 };
 
 AboutPageHandler::AboutPageHandler()
     : progress_(-1),
       sticky_(false),
-      started_(false)
-{}
+      started_(false) {
+}
 
 AboutPageHandler::~AboutPageHandler() {
   if (update_observer_.get()) {
     DBusThreadManager::Get()->GetUpdateEngineClient()->
         RemoveObserver(update_observer_.get());
   }
 }
 
 void AboutPageHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
+  DCHECK(localized_strings->empty());
 
-  static OptionsStringResource resources[] = {
+  struct L10nResources {
+    const char* name;
+    int ids;
+  };
+
+  static L10nResources resources[] = {
+    { "pageTitle", IDS_ABOUT_TAB_TITLE },
     { "firmware", IDS_ABOUT_PAGE_FIRMWARE },
     { "product", IDS_PRODUCT_OS_NAME },
     { "os", IDS_PRODUCT_OS_NAME },
     { "platform", IDS_PLATFORM_LABEL },
     { "loading", IDS_ABOUT_PAGE_LOADING },
     { "check_now", IDS_ABOUT_PAGE_CHECK_NOW },
     { "update_status", IDS_UPGRADE_CHECK_STARTED },
     { "restart_now", IDS_RELAUNCH_AND_UPDATE },
     { "browser", IDS_PRODUCT_NAME },
     { "more_info", IDS_ABOUT_PAGE_MORE_INFO },
     { "copyright", IDS_ABOUT_VERSION_COPYRIGHT },
     { "channel", IDS_ABOUT_PAGE_CHANNEL },
     { "stable", IDS_ABOUT_PAGE_CHANNEL_STABLE },
     { "beta", IDS_ABOUT_PAGE_CHANNEL_BETA },
     { "dev", IDS_ABOUT_PAGE_CHANNEL_DEVELOPMENT },
     { "canary", IDS_ABOUT_PAGE_CHANNEL_CANARY },
     { "channel_warning_header", IDS_ABOUT_PAGE_CHANNEL_WARNING_HEADER },
     { "channel_warning_text", IDS_ABOUT_PAGE_CHANNEL_WARNING_TEXT },
     { "user_agent", IDS_ABOUT_VERSION_USER_AGENT },
     { "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
 
   chrome::VersionInfo version_info;
   DCHECK(version_info.is_valid());
 
   std::string browser_version = version_info.Version();
   std::string version_modifier =
       chrome::VersionInfo::GetVersionStringModifier();
   if (!version_modifier.empty())
@@ skipping 274 matching lines @@
   if (DBusThreadManager::Get()->GetUpdateEngineClient()
       ->HasObserver(observer)) {
     // If UpdateEngineClient still has the observer, then the page handler
     // is valid.
     AboutPageHandler* handler = observer->page_handler();
     scoped_ptr<Value> channel_string(Value::CreateStringValue(channel));
     handler->web_ui()->CallJavascriptFunction(
         "AboutPage.updateSelectedOptionCallback", *channel_string);
   }
 }
-
-}  // namespace options2
-}  // namespace chromeos