Enable pnacl by default

chrome/browser/ui/webui/nacl_ui.cc

 // 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 <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 199 matching lines @@
   results->SetString("key", key);
   results->SetString("value", value);
   list->Append(results);
 }
 
 // Generate an empty data-pair which acts as a line break.
 void AddLineBreak(ListValue* list) {
   AddPair(list, ASCIIToUTF16(""), ASCIIToUTF16(""));
 }
 
-// Check whether a commandline switch is turned on or off.
-void ListFlagStatus(ListValue* list, const std::string& flag_label,
-                    const std::string& flag_name) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(flag_name))
-    AddPair(list, ASCIIToUTF16(flag_label), ASCIIToUTF16("On"));
-  else
-    AddPair(list, ASCIIToUTF16(flag_label), ASCIIToUTF16("Off"));
-}
-
 void NaClDomHandler::HandleRequestNaClInfo(const ListValue* args) {
   page_has_requested_data_ = true;
   // Force re-validation of pnacl's path in the next call to
   // MaybeRespondToPage(), in case PNaCl went from not-installed
   // to installed since the request.
   pnacl_path_validated_ = false;
   MaybeRespondToPage();
 }
 
 void NaClDomHandler::OnGotPlugins(
@@ skipping 41 matching lines @@
           ASCIIToUTF16(os_label));
 
   AddLineBreak(list.get());
 
   // Obtain the version of the NaCl plugin.
   std::vector<content::WebPluginInfo> info_array;
   PluginService::GetInstance()->GetPluginInfoArray(
       GURL(), "application/x-nacl", false, &info_array, NULL);
   string16 nacl_version;
   string16 nacl_key = ASCIIToUTF16("NaCl plugin");
+  bool plugin_enabled = true;
   if (info_array.empty()) {
     AddPair(list.get(), nacl_key, ASCIIToUTF16("Disabled"));
+    plugin_enabled = false;
   } else {
     PluginPrefs* plugin_prefs =
         PluginPrefs::GetForProfile(Profile::FromWebUI(web_ui())).get();
 
     // 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])) {
+      plugin_enabled = false;
       nacl_version += ASCIIToUTF16(" (Disabled in profile prefs)");
       AddPair(list.get(), nacl_key, nacl_version);
     }
 
     AddPair(list.get(), nacl_key, 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]))
+      if (!plugin_prefs->IsPluginEnabled(info_array[i])) {
+        plugin_enabled = false;

[Mark Seaborn, 2013/07/22 23:28:10]

I don't understand this.  If there are multiple plugins handling
"application/x-nacl" (when would that happen?), and one of them is disabled, we
say "plugin_enabled = false"?  That doesn't seem right.

What's the intent behind the changes to nacl_ui.cc?  Can you comment this in the
commit message?

[sehr, 2013/07/23 22:03:26]

There weren't multiple plugins handling the mime type, but we had a print
artifact, which I have now removed, along with the flag setting.

         nacl_version += ASCIIToUTF16(" (Disabled in profile prefs)");
+      }
       AddPair(list.get(), nacl_key, nacl_version);
     }
   }
 
-  // Check that commandline flags are enabled.
-  ListFlagStatus(list.get(), "Flag '--enable-nacl'", switches::kEnableNaCl);
+  // Display whether NaCl is enabled.
+  string16 nacl_enabled_string = ASCIIToUTF16("Disabled");
+  if (plugin_enabled &&
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNaCl)) {
+    nacl_enabled_string = ASCIIToUTF16("Enabled by flag '--enable-nacl'");
+  }
+  AddPair(list.get(), ASCIIToUTF16("Native Client"), nacl_enabled_string);
 
   AddLineBreak(list.get());
 
+  // Display whether PNaCl is enabled.
+  string16 pnacl_enabled_string = ASCIIToUTF16("Enabled");
+  if (!plugin_enabled) {
+    pnacl_enabled_string = ASCIIToUTF16("Disabled in profile prefs");
+  }
+  else if (CommandLine::ForCurrentProcess()->HasSwitch(

[Mark Seaborn, 2013/07/22 23:28:10]

Should go on previous line as "} else if"

[sehr, 2013/07/23 22:03:26]

Done.

+      switches::kDisablePnacl)) {

[Mark Seaborn, 2013/07/22 23:28:10]

Fix indentation here.

// good
if (SomeFunc(
        arg1, arg2)) {

// bad
if (SomeFunc(
    arg1, arg2)) {

[sehr, 2013/07/23 22:03:26]

Done.

+    pnacl_enabled_string = ASCIIToUTF16("Disabled by flag '--disable-pnacl'");
+  }
+  AddPair(list.get(),
+          ASCIIToUTF16("Portable Native Client"),
+          pnacl_enabled_string);
+
   // Obtain the version of the PNaCl translator.
   base::FilePath pnacl_path;
   bool got_path = PathService::Get(chrome::DIR_PNACL_COMPONENT, &pnacl_path);
   if (!got_path || pnacl_path.empty() || !pnacl_path_exists_) {
     AddPair(list.get(),
             ASCIIToUTF16("PNaCl translator"),
             ASCIIToUTF16("Not installed"));
   } else {
     AddPair(list.get(),
             ASCIIToUTF16("PNaCl translator path"),
             pnacl_path.LossyDisplayName());
     // Version string is part of the directory name:
     // pnacl/<version>/_platform_specific/<arch>/[files]
     // Keep in sync with pnacl_component_installer.cc.
     AddPair(list.get(),
             ASCIIToUTF16("PNaCl translator version"),
             pnacl_path.DirName().DirName().BaseName().LossyDisplayName());
   }
 
-  ListFlagStatus(list.get(), "Flag '--enable-pnacl'", switches::kEnablePnacl);
   // naclInfo will take ownership of list, and clean it up on destruction.
   naclInfo->Set("naclInfo", list.release());
 }
 
 void NaClDomHandler::DidValidatePnaclPath(bool is_valid) {
   pnacl_path_validated_ = true;
   pnacl_path_exists_ = is_valid;
   MaybeRespondToPage();
 }
 
@@ skipping 24 matching lines @@
 
 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);
   content::WebUIDataSource::Add(profile, CreateNaClUIHTMLSource());
 }