Refactor the about:version code out of about_ui.

chrome/browser/ui/webui/version_ui.cc

Index: chrome/browser/ui/webui/version_ui.cc
===================================================================
--- chrome/browser/ui/webui/version_ui.cc	(revision 0)
+++ chrome/browser/ui/webui/version_ui.cc	(revision 0)
@@ -0,0 +1,135 @@
+// 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/version_ui.h"
+
+#include "base/command_line.h"
+#include "base/file_util.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
+#include "chrome/browser/ui/webui/version_handler.h"
+#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/jstemplate_builder.h"
+#include "chrome/common/url_constants.h"
+#include "content/public/browser/web_ui.h"
+#include "content/public/common/content_client.h"
+#include "grit/browser_resources.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+#include "grit/google_chrome_strings.h"
+#include "v8/include/v8.h"
+#include "webkit/user_agent/user_agent_util.h"
+
+#if defined(ENABLE_THEMES)
+#include "chrome/browser/ui/webui/theme_source.h"
+#endif
+
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/webui/version_handler_chromeos.h"
+#endif
+
+namespace {
+
+ChromeWebUIDataSource* CreateVersionUIDataSource(Profile* profile) {
+  ChromeWebUIDataSource* html_source =
+      new ChromeWebUIDataSource(chrome::kChromeUIVersionHost);
+
+  // Localized and data strings.
+  html_source->AddLocalizedString("title", IDS_ABOUT_VERSION_TITLE);
+  html_source->AddLocalizedString("name", IDS_PRODUCT_NAME);
+  chrome::VersionInfo version_info;
+  html_source->AddString("version", version_info.Version());
+  // http://crbug.com/79458: Need to evaluate the use of getting the version
+  // string on this thread.
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
+  html_source->AddString("version_modifier",
+                         chrome::VersionInfo::GetVersionStringModifier());
+  html_source->AddLocalizedString("os_name", IDS_ABOUT_VERSION_OS);
+  html_source->AddLocalizedString("platform", IDS_PLATFORM_LABEL);
+  html_source->AddString("os_type", version_info.OSType());
+  html_source->AddString("os_version", string16());

[Evan Stade, 2012/09/14 15:11:30]

for blank strings (where it doesn't matter either way) I'd go with std::string
to save a conversion.

[SteveT, 2012/09/14 15:28:37]

Done.

+  html_source->AddString("webkit_version", webkit_glue::GetWebKitVersion());
+  html_source->AddString("js_engine", "V8");
+  html_source->AddString("js_version", v8::V8::GetVersion());
+
+#if !defined(OS_ANDROID)
+  html_source->AddString("flash_plugin", "Flash");
+  // Note that the Flash version is retrieve asynchronously and returned in
+  // VersionHandler::OnGotPlugins. The area is initially blank.
+  html_source->AddString("flash_version", string16());
+#endif
+  html_source->AddLocalizedString("company", IDS_ABOUT_VERSION_COMPANY_NAME);
+  html_source->AddLocalizedString("copyright", IDS_ABOUT_VERSION_COPYRIGHT);
+  html_source->AddString("cl", version_info.LastChange());
+  html_source->AddLocalizedString("official",
+      version_info.IsOfficialBuild() ? IDS_ABOUT_VERSION_OFFICIAL :
+                                       IDS_ABOUT_VERSION_UNOFFICIAL);
+  html_source->AddLocalizedString("user_agent_name",
+                                  IDS_ABOUT_VERSION_USER_AGENT);
+  html_source->AddString("useragent", content::GetUserAgent(GURL()));
+  html_source->AddLocalizedString("command_line_name",
+                                  IDS_ABOUT_VERSION_COMMAND_LINE);
+
+#if defined(OS_WIN)
+  html_source->AddString("command_line",
+      WideToUTF16(CommandLine::ForCurrentProcess()->GetCommandLineString()));
+#elif defined(OS_POSIX)
+  std::string command_line = "";
+  typedef std::vector<std::string> ArgvList;
+  const ArgvList& argv = CommandLine::ForCurrentProcess()->argv();
+  for (ArgvList::const_iterator iter = argv.begin(); iter != argv.end(); iter++)
+    command_line += " " + *iter;
+  // TODO(viettrungluu): |command_line| could really have any encoding, whereas
+  // below we assumes it's UTF-8.
+  html_source->AddString("command_line", command_line);
+#endif
+
+  // Note that the executable path and profile path are retrieved asynchronously
+  // and returned in VersionHandler::OnGotFilePaths. The area is initially
+  // blank.
+  html_source->AddLocalizedString("executable_path_name",
+                                  IDS_ABOUT_VERSION_EXECUTABLE_PATH);
+  html_source->AddString("executable_path", string16());
+
+  html_source->AddLocalizedString("profile_path_name",
+                                  IDS_ABOUT_VERSION_PROFILE_PATH);
+  html_source->AddString("profile_path", string16());
+
+#if !defined(NDEBUG)
+  html_source->AddLocalizedString("variations_name",
+                                  IDS_ABOUT_VERSION_VARIATIONS);
+#endif
+  html_source->set_use_json_js_format_v2();
+  html_source->set_json_path("strings.js");
+  html_source->add_resource_path("version.js", IDR_ABOUT_VERSION_JS);
+  html_source->set_default_resource(IDR_ABOUT_VERSION_HTML);
+  return html_source;
+}
+
+}  // namespace
+
+VersionUI::VersionUI(content::WebUI* web_ui)
+    : content::WebUIController(web_ui) {
+  Profile* profile = Profile::FromWebUI(web_ui);
+
+#if defined(OS_CHROMEOS)
+  web_ui->AddMessageHandler(new VersionHandlerChromeOS());
+#else
+  web_ui->AddMessageHandler(new VersionHandler());
+#endif
+
+#if defined(ENABLE_THEMES)
+  // Set up the chrome://theme/ source.
+  ThemeSource* theme = new ThemeSource(profile);
+  ChromeURLDataManager::AddDataSource(profile, theme);
+#endif
+
+  ChromeURLDataManager::AddDataSource(profile,
+                                      CreateVersionUIDataSource(profile));
+}
+
+VersionUI::~VersionUI() {
+}
Property changes on: chrome/browser/ui/webui/version_ui.cc
___________________________________________________________________
Added: svn:eol-style
   + LF