Add confirmation dialog when enabling a 3rd party IME.

chrome/browser/ui/webui/options/chromeos/cros_language_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/chromeos/cros_language_options_handler.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 101 matching lines @@
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   // GetSupportedInputMethods() never return NULL.
   scoped_ptr<input_method::InputMethodDescriptors> descriptors(
       manager->GetSupportedInputMethods());
   localized_strings->Set("languageList", GetAcceptLanguageList(*descriptors));
   localized_strings->Set("inputMethodList", GetInputMethodList(*descriptors));
 
   input_method::InputMethodDescriptors ext_ime_descriptors;
   manager->GetInputMethodExtensions(&ext_ime_descriptors);
-  localized_strings->Set("extensionImeList",
-                         ConvertInputMethodDescriptosToIMEList(
-                             ext_ime_descriptors));
+
+  base::ListValue* ext_ime_list = ConvertInputMethodDescriptorsToIMEList(
+      ext_ime_descriptors);
+  AddImeProvider(ext_ime_list);
+  localized_strings->Set("extensionImeList", ext_ime_list);
 
   ComponentExtensionIMEManager* component_extension_manager =
       input_method::InputMethodManager::Get()
           ->GetComponentExtensionIMEManager();
   if (component_extension_manager->IsInitialized()) {
     localized_strings->Set(
         "componentExtensionImeList",
-        ConvertInputMethodDescriptosToIMEList(
+        ConvertInputMethodDescriptorsToIMEList(
             component_extension_manager->GetAllIMEAsInputMethodDescriptor()));
     composition_extension_appended_ = true;
   } else {
     // If component extension IME manager is not ready for use, it will be
     // added in |InitializePage()|.
     localized_strings->Set("componentExtensionImeList",
                            new base::ListValue());
   }
 }
 
 void CrosLanguageOptionsHandler::RegisterMessages() {
   ::options::LanguageOptionsHandlerCommon::RegisterMessages();
 
   web_ui()->RegisterMessageCallback("inputMethodDisable",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodDisableCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("inputMethodEnable",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodEnableCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("inputMethodOptionsOpen",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("uiLanguageRestart",
       base::Bind(&CrosLanguageOptionsHandler::RestartCallback,
                  base::Unretained(this)));
 }
 
+// static
 base::ListValue* CrosLanguageOptionsHandler::GetInputMethodList(
     const input_method::InputMethodDescriptors& descriptors) {
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
 
   base::ListValue* input_method_list = new base::ListValue();
 
   for (size_t i = 0; i < descriptors.size(); ++i) {
     const input_method::InputMethodDescriptor& descriptor =
         descriptors[i];
@@ skipping 241 matching lines @@
 
 // static
 base::ListValue* CrosLanguageOptionsHandler::GetUILanguageList(
     const input_method::InputMethodDescriptors& descriptors) {
   // Collect the language codes from the available locales.
   return GetLanguageListInternal(
       descriptors, l10n_util::GetAvailableLocales(), true);
 }
 
 base::ListValue*
-    CrosLanguageOptionsHandler::ConvertInputMethodDescriptosToIMEList(
+    CrosLanguageOptionsHandler::ConvertInputMethodDescriptorsToIMEList(
         const input_method::InputMethodDescriptors& descriptors) {
   scoped_ptr<base::ListValue> ime_ids_list(new base::ListValue());
   for (size_t i = 0; i < descriptors.size(); ++i) {
     const input_method::InputMethodDescriptor& descriptor = descriptors[i];
     scoped_ptr<base::DictionaryValue> dictionary(new base::DictionaryValue());
     dictionary->SetString("id", descriptor.id());
     dictionary->SetString("displayName", descriptor.name());
     dictionary->SetString("optionsPage", descriptor.options_page_url().spec());
     scoped_ptr<base::DictionaryValue> language_codes(
         new base::DictionaryValue());
@@ skipping 80 matching lines @@
     // extension IMEs will be done in InitializePage function later.
     return;
   }
 
   ComponentExtensionIMEManager* manager =
       input_method::InputMethodManager::Get()
           ->GetComponentExtensionIMEManager();
 
   DCHECK(manager->IsInitialized());
   scoped_ptr<base::ListValue> ime_list(
-      ConvertInputMethodDescriptosToIMEList(
+      ConvertInputMethodDescriptorsToIMEList(
           manager->GetAllIMEAsInputMethodDescriptor()));
   web_ui()->CallJavascriptFunction(
       "options.LanguageOptions.onComponentManagerInitialized",
       *ime_list);
   composition_extension_appended_ = true;
 }
 
 void CrosLanguageOptionsHandler::InitializePage() {
   is_page_initialized_ = true;
   if (composition_extension_appended_)
     return;
 
   ComponentExtensionIMEManager* component_extension_manager =
       input_method::InputMethodManager::Get()
           ->GetComponentExtensionIMEManager();
   if (!component_extension_manager->IsInitialized()) {
     // If the component extension IME manager is not available yet, append the
     // component extension list in |OnInitialized()|.
     return;
   }
 
   scoped_ptr<base::ListValue> ime_list(
-      ConvertInputMethodDescriptosToIMEList(
+      ConvertInputMethodDescriptorsToIMEList(
           component_extension_manager->GetAllIMEAsInputMethodDescriptor()));
   web_ui()->CallJavascriptFunction(
       "options.LanguageOptions.onComponentManagerInitialized",
       *ime_list);
   composition_extension_appended_ = true;
 }
 
+void CrosLanguageOptionsHandler::AddImeProvider(base::ListValue* list) {
+  Profile* profile = Profile::FromWebUI(web_ui());
+  ExtensionService* extension_service = profile->GetExtensionService();
+  for (size_t i = 0; i < list->GetSize(); i++) {
+    base::DictionaryValue* entry;
+    list->GetDictionary(i, &entry);
+
+    std::string input_method_id;
+    entry->GetString("id", &input_method_id);
+
+    std::string extension_id =
+        extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id);
+    const extensions::Extension* extension =
+        extension_service->GetExtensionById(extension_id, false);
+    if (extension)
+      entry->SetString("extensionName", extension->name());
+  }
+}
+
 }  // namespace options
 }  // namespace chromeos