Add a chrome://nacl page to show if NaCl is enabled and if PNaCl is installed.

chrome/browser/ui/webui/nacl_ui.cc

Index: chrome/browser/ui/webui/nacl_ui.cc
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2afdfff00e835aa5a03bc8ed05d9ae6fbde199f3
--- /dev/null
+++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -0,0 +1,268 @@
+// 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/nacl_ui.h"
+
+#include <map>
+#include <string>
+#include <vector>
+
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/command_line.h"
+#include "base/memory/weak_ptr.h"
+#include "base/path_service.h"
+#include "base/string16.h"
+#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
+#include "base/values.h"
+#include "chrome/browser/plugin_prefs.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/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/url_constants.h"
+#include "content/public/browser/plugin_service.h"
+#include "content/public/browser/user_metrics.h"
+#include "content/public/browser/web_ui.h"
+#include "content/public/browser/web_ui_message_handler.h"
+#include "grit/browser_resources.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "webkit/plugins/webplugininfo.h"
+
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
+
+using content::PluginService;
+using content::UserMetricsAction;
+using content::WebUIMessageHandler;
+
+namespace {
+
+ChromeWebUIDataSource* CreateNaClUIHTMLSource() {
+  ChromeWebUIDataSource* source =
+      new ChromeWebUIDataSource(chrome::kChromeUINaClHost);
+
+  source->AddLocalizedString("loadingMessage", IDS_NACL_LOADING_MESSAGE);
+  source->AddLocalizedString("naclLongTitle", IDS_NACL_TITLE_MESSAGE);
+  source->set_json_path("strings.js");
+  source->add_resource_path("about_nacl.js", IDR_ABOUT_NACL_JS);
+  source->set_default_resource(IDR_ABOUT_NACL_HTML);
+  return source;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// NaClDOMHandler
+//
+////////////////////////////////////////////////////////////////////////////////
+
+// The handler for JavaScript messages for the about:flags page.
+class NaClDOMHandler : public WebUIMessageHandler {
+ public:
+  NaClDOMHandler();
+  virtual ~NaClDOMHandler();
+
+  // WebUIMessageHandler implementation.
+  virtual void RegisterMessages() OVERRIDE;
+
+  // Callback for the "requestNaClInfo" message.
+  void HandleRequestNaClInfo(const ListValue* args);
+
+  // Callback for the NaCl plugin information.
+  void OnGotPlugins(const std::vector<webkit::WebPluginInfo>& plugins);
+
+ private:
+  // Called when we think we might have enough information to return data back
+  // to the page.
+  void MaybeRespondToPage();
+
+  // Factory for the creating refs in callbacks.
+  base::WeakPtrFactory<NaClDOMHandler> weak_ptr_factory_;
+
+  // Whether the page has requested data.
+  bool page_has_requested_data_;
+  // Whether the plugin information is ready.
+  bool has_plugin_info_;
+
+  DISALLOW_COPY_AND_ASSIGN(NaClDOMHandler);
+};
+
+NaClDOMHandler::NaClDOMHandler()
+    : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      page_has_requested_data_(false),
+      has_plugin_info_(false) {
+  PluginService::GetInstance()->GetPlugins(base::Bind(
+      &NaClDOMHandler::OnGotPlugins, weak_ptr_factory_.GetWeakPtr()));
+}
+
+NaClDOMHandler::~NaClDOMHandler() {
+}
+
+void NaClDOMHandler::RegisterMessages() {
+  web_ui()->RegisterMessageCallback("requestNaClInfo",
+      base::Bind(&NaClDOMHandler::HandleRequestNaClInfo,
+                 base::Unretained(this)));
+}
+
+void AddPair(ListValue* list, const string16& key, const string16& value) {
+  DictionaryValue* results = new DictionaryValue();
+  results->SetString("key", key);
+  results->SetString("value", value);
+  list->Append(results);
+}
+
+void AddPair(ListValue* list, const string16& key, const std::string& value) {
+  AddPair(list, key, ASCIIToUTF16(value));
+}
+
+void AddLineBreak(ListValue* list) {
+  AddPair(list, ASCIIToUTF16(""), ASCIIToUTF16(""));
+}
+
+void ListFlagStatus(ListValue* list, const std::string& flag_label,
+                    const std::string& flag_name) {
+  string16 flag_label_as_key = ASCIIToUTF16(flag_label);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(flag_name)) {
+    AddPair(list, flag_label_as_key, "On");
+  } else {
+    AddPair(list, flag_label_as_key, "Off");
+  }
+}
+
+void NaClDOMHandler::HandleRequestNaClInfo(const ListValue* args) {
+  page_has_requested_data_ = true;
+  MaybeRespondToPage();
+}
+
+void NaClDOMHandler::OnGotPlugins(
+    const std::vector<webkit::WebPluginInfo>& plugins) {
+  has_plugin_info_ = true;
+  MaybeRespondToPage();
+}
+
+void NaClDOMHandler::MaybeRespondToPage() {
+  // We don't reply until everything is ready. The page is showing a 'loading'
+  // message until then.
+  if (!page_has_requested_data_ || !has_plugin_info_) {
+    return;
+  }
+
+  // Store Key-Value pairs of about-information.

[Robert Muth (chromium), 2012/08/08 17:57:58]

I think the code would be clearer if everything
which populate list is moved to a separate function.

Note sure whether this function should also allocate "list".

[jvoung - send to chromium..., 2012/08/08 19:03:11]

Done -- made that separate function allocate list also.

+  ListValue* list = new ListValue();

[Robert Muth (chromium), 2012/08/08 17:57:58]

indicate whose responsibility it is to free "list"

[jvoung - send to chromium..., 2012/08/08 19:03:11]

Done.

+
+  // Obtain the Chrome version info.
+  chrome::VersionInfo version_info;
+  AddPair(list,
+          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
+          version_info.Version() + " (" +
+          chrome::VersionInfo::GetVersionStringModifier() + ")");
+
+  // OS version information.
+  // TODO(jvoung): refactor this to share the extra windows labeling
+  // with about:flash, or something.
+  std::string os_label = version_info.OSType();
+#if defined(OS_WIN)
+  base::win::OSInfo* os = base::win::OSInfo::GetInstance();
+  switch (os->version()) {
+    case base::win::VERSION_XP: os_label += " XP"; break;
+    case base::win::VERSION_SERVER_2003:
+      os_label += " Server 2003 or XP Pro 64 bit";
+      break;
+    case base::win::VERSION_VISTA: os_label += " Vista or Server 2008"; break;
+    case base::win::VERSION_WIN7: os_label += " 7 or Server 2008 R2"; break;
+    case base::win::VERSION_WIN8: os_label += " 8 or Server 2012"; break;
+    default:  os_label += " UNKNOWN"; break;
+  }
+  os_label += " SP" + base::IntToString(os->service_pack().major);
+  if (os->service_pack().minor > 0)
+    os_label += "." + base::IntToString(os->service_pack().minor);
+  if (os->architecture() == base::win::OSInfo::X64_ARCHITECTURE)
+    os_label += " 64 bit";
+#endif
+  AddPair(list, l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_OS), os_label);
+
+  AddLineBreak(list);
+
+  // Obtain the version of the NaCl plugin.
+  std::vector<webkit::WebPluginInfo> info_array;
+  PluginService::GetInstance()->GetPluginInfoArray(
+      GURL(), "application/x-nacl", false, &info_array, NULL);
+  string16 nacl_version;
+  if (info_array.empty()) {
+    AddPair(list, ASCIIToUTF16("NaCl plugin"), "Disabled");
+  } else {
+    PluginPrefs* plugin_prefs =
+        PluginPrefs::GetForProfile(Profile::FromWebUI(web_ui()));
+
+    // Only the 0th plugin is used.
+    nacl_version = info_array[0].version + ASCIIToUTF16(" ") +
+        info_array[0].path.LossyDisplayName();
+    if (!plugin_prefs->IsPluginEnabled(info_array[0])) {
+      nacl_version += ASCIIToUTF16(" (Disabled in profile prefs)");
+      AddPair(list, ASCIIToUTF16("NaCl plugin"), nacl_version);
+    }
+
+    AddPair(list, ASCIIToUTF16("NaCl plugin"), nacl_version);
+
+    // Mark the rest as not used.
+    for (size_t i = 1; i < info_array.size(); ++i) {
+      nacl_version = info_array[i].version + ASCIIToUTF16(" ") +
+          info_array[i].path.LossyDisplayName();
+      nacl_version += ASCIIToUTF16(" (not used)");
+      if (!plugin_prefs->IsPluginEnabled(info_array[i])) {
+        nacl_version += ASCIIToUTF16(" (Disabled in profile prefs)");
+      }
+      AddPair(list, ASCIIToUTF16("NaCl plugin"), nacl_version);
+    }
+  }
+
+  // Check that commandline flags are enabled.
+  ListFlagStatus(list, "Flag '--enable-nacl'", switches::kEnableNaCl);
+
+  AddLineBreak(list);
+
+  // Obtain the version of the PNaCl translator.
+  FilePath pnacl_path;
+  bool got_path = PathService::Get(chrome::DIR_PNACL_COMPONENT, &pnacl_path);
+  if (!got_path || pnacl_path.empty()) {
+    AddPair(list, ASCIIToUTF16("PNaCl translator"), "Not installed");
+  } else {
+    AddPair(list, ASCIIToUTF16("PNaCl translator path: "),
+            pnacl_path.LossyDisplayName());
+    AddPair(list, ASCIIToUTF16("PNaCl translator version: "),
+            pnacl_path.BaseName().LossyDisplayName());
+  }
+
+  ListFlagStatus(list, "Flag '--enable-pnacl'", switches::kEnablePnacl);
+
+  DictionaryValue naclInfo;
+  naclInfo.Set("naclInfo", list);
+  web_ui()->CallJavascriptFunction("returnNaClInfo", naclInfo);
+}
+
+}  // namespace
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// NaClUI
+//
+///////////////////////////////////////////////////////////////////////////////
+
+NaClUI::NaClUI(content::WebUI* web_ui) : WebUIController(web_ui) {
+  content::RecordAction(UserMetricsAction("ViewAboutNaCl"));
+
+  web_ui->AddMessageHandler(new NaClDOMHandler());
+
+  // Set up the about:nacl source.
+  Profile* profile = Profile::FromWebUI(web_ui);
+  ChromeURLDataManager::AddDataSource(profile, CreateNaClUIHTMLSource());
+}