chrome://voicesearch: Change some labels to clarify their meaning.

chrome/browser/ui/webui/voice_search_ui.cc

 // Copyright 2014 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/voice_search_ui.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
@@ skipping 253 matching lines @@
           plugin_prefs->IsPluginEnabled(info)) {
         nacl_enabled = "Yes";
       }
     }
 #endif
 
     AddPair(list, "NaCl Enabled", nacl_enabled);
 
     HotwordService* hotword_service =
         HotwordServiceFactory::GetForProfile(profile_);
-    AddPair(list, "Microphone",
+    AddPair(list, "Microphone Present",
             hotword_service && hotword_service->microphone_available() ? "Yes"
                                                                        : "No");
 
     std::string audio_capture = "No";
     if (profile_->GetPrefs()->GetBoolean(prefs::kAudioCaptureAllowed))
       audio_capture = "Yes";
     AddPair(list, "Audio Capture Allowed", audio_capture);
 
     AddLineBreak(list);
   }
@@ skipping 11 matching lines @@
 
     AddPair(list,
             "Hotword Previous Language",
             profile_->GetPrefs()->GetString(prefs::kHotwordPreviousLanguage));
 
     AddLineBreak(list);
   }
 
   // Adds information specific to the hotword configuration to the list.
   void AddHotwordInfo(base::ListValue* list)  {
+    HotwordService* hotword_service =
+        HotwordServiceFactory::GetForProfile(profile_);
+    std::string hotword_allowed = "No";
+    if (hotword_service && hotword_service->IsHotwordAllowed())
+      hotword_allowed = "Yes";
+    AddPair(list, "Hotword Module Installable", hotword_allowed);
+
     std::string search_enabled = "No";
     if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled))
       search_enabled = "Yes";
     AddPair(list, "Hotword Search Enabled", search_enabled);
 
     std::string always_on_search_enabled = "No";
     if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled))
       always_on_search_enabled = "Yes";
     AddPair(list, "Always-on Hotword Search Enabled", always_on_search_enabled);
 
     std::string audio_logging_enabled = "No";
-    HotwordService* hotword_service =
-        HotwordServiceFactory::GetForProfile(profile_);
     if (hotword_service && hotword_service->IsOptedIntoAudioLogging())
       audio_logging_enabled = "Yes";
     AddPair(list, "Hotword Audio Logging Enabled", audio_logging_enabled);
 
     AddLineBreak(list);
   }
 
   // Adds information specific to an extension to the list.
   void AddExtensionInfo(const std::string& extension_id,
                         const std::string& name_prefix,
@@ skipping 104 matching lines @@
 VoiceSearchUI::VoiceSearchUI(content::WebUI* web_ui)
     : content::WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   web_ui->AddMessageHandler(new VoiceSearchDomHandler(profile));
 
   // Set up the about:voicesearch source.
   content::WebUIDataSource::Add(profile, CreateVoiceSearchUiHtmlSource());
 }
 
 VoiceSearchUI::~VoiceSearchUI() {}