Fine tuned availability of hotword plugin.

chrome/browser/ui/webui/options/browser_options_handler.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/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "apps/shell_window.h"
@@ skipping 361 matching lines @@
     { "autoclickDelayVeryShort",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT },
     { "autoclickDelayShort",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT },
     { "autoclickDelayLong",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG },
     { "autoclickDelayVeryLong",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG },
     { "enableContentProtectionAttestation",
       IDS_OPTIONS_ENABLE_CONTENT_PROTECTION_ATTESTATION },
+    { "enableHotwordAppList", IDS_OPTIONS_ENABLE_HOTWORD_APP_LIST },
     { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING },
     { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
     { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON },
     { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON },
     { "factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING },
     { "factoryResetHelpUrl", IDS_FACTORY_RESET_HELP_URL },
     { "changePicture", IDS_OPTIONS_CHANGE_PICTURE },
     { "changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION },
     { "datetimeTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME },
     { "deviceGroupDescription", IDS_OPTIONS_DEVICE_GROUP_DESCRIPTION },
@@ skipping 468 matching lines @@
   SetupAccessibilityFeatures();
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   if (!connector->IsEnterpriseManaged() &&
       !chromeos::UserManager::Get()->IsLoggedInAsGuest() &&
       !chromeos::UserManager::Get()->IsLoggedInAsLocallyManagedUser()) {
     web_ui()->CallJavascriptFunction(
         "BrowserOptions.enableFactoryResetSection");
   }
 
+  Profile* profile = Profile::FromWebUI(web_ui());
   OnAccountPictureManagedChanged(
-      policy::ProfilePolicyConnectorFactory::GetForProfile(
-          Profile::FromWebUI(web_ui()))->
+      policy::ProfilePolicyConnectorFactory::GetForProfile(profile)->
           policy_service()->GetPolicies(
               policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME,
                                       std::string()))
              .Get(policy::key::kUserAvatarImage));
+
+  if (HotwordService::DoesHotwordSupportLanguage(profile))
+    web_ui()->CallJavascriptFunction("BrowserOptions.showAppListHotword");

[Evan Stade, 2014/02/11 18:54:12]

you should do this in GetLocalizedValues (like the sync setup) and not call a JS
function, but set some variable for the page to read. This way it doesn't jiggle
after resources load but before page init.

[Jun Mukai, 2014/02/11 19:27:38]

Done.

 #endif
 }
 
 // static
 void BrowserOptionsHandler::CheckAutoLaunch(
     base::WeakPtr<BrowserOptionsHandler> weak_this,
     const base::FilePath& profile_path) {
 #if defined(OS_WIN)
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
@@ skipping 818 matching lines @@
 void BrowserOptionsHandler::SetupManagingSupervisedUsers() {
   bool has_users = !Profile::FromWebUI(web_ui())->
       GetPrefs()->GetDictionary(prefs::kManagedUsers)->empty();
   base::FundamentalValue has_users_value(has_users);
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.updateManagesSupervisedUsers",
       has_users_value);
 }
 
 }  // namespace options