Remove the flag g_use_wrapped_extension_keyboard_layouts.

chrome/browser/chromeos/input_method/input_method_manager_impl.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/chromeos/input_method/input_method_manager_impl.h"
 
 #include <algorithm>  // std::find
 
 #include "ash/ime/input_method_menu_item.h"
 #include "ash/ime/input_method_menu_manager.h"
@@ skipping 17 matching lines @@
 #include "chromeos/ime/ime_keyboard.h"
 #include "chromeos/ime/input_method_delegate.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "ui/base/accelerators/accelerator.h"
 
 namespace chromeos {
 namespace input_method {
 
 namespace {
 
-const char nacl_mozc_jp_id[] =
-    "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_jp";
-
 bool Contains(const std::vector<std::string>& container,
               const std::string& value) {
   return std::find(container.begin(), container.end(), value) !=
       container.end();
 }
 
 }  // namespace
 
 bool InputMethodManagerImpl::IsLoginKeyboard(
     const std::string& layout) const {
@@ skipping 57 matching lines @@
         candidate_window_controller_.reset();
       break;
     }
   }
 }
 
 scoped_ptr<InputMethodDescriptors>
 InputMethodManagerImpl::GetSupportedInputMethods() const {
   scoped_ptr<InputMethodDescriptors> whitelist_imes =
       whitelist_.GetSupportedInputMethods();
-  if (!extension_ime_util::UseWrappedExtensionKeyboardLayouts())
+  if (!component_extension_ime_manager_->IsInitialized())
     return whitelist_imes.Pass();
   return scoped_ptr<InputMethodDescriptors>(new InputMethodDescriptors).Pass();
 }
 
 scoped_ptr<InputMethodDescriptors>
 InputMethodManagerImpl::GetActiveInputMethods() const {
   scoped_ptr<InputMethodDescriptors> result(new InputMethodDescriptors);
   // Build the active input method descriptors from the active input
   // methods cache |active_input_method_ids_|.
   for (size_t i = 0; i < active_input_method_ids_.size(); ++i) {
@@ skipping 93 matching lines @@
   active_input_method_ids_.swap(layouts);
 
   // Initialize candidate window controller and widgets such as
   // candidate window, infolist and mode indicator.  Note, mode
   // indicator is used by only keyboard layout input methods.
   if (active_input_method_ids_.size() > 1)
     MaybeInitializeCandidateWindowController();
 
   // you can pass empty |initial_layout|.
   ChangeInputMethod(initial_layouts.empty() ? "" :
-      extension_ime_util::GetInputMethodIDByKeyboardLayout(
-          initial_layouts[0]));
+      extension_ime_util::GetInputMethodIDByEngineID(initial_layouts[0]));
 }
 
 // Adds new input method to given list.
 bool InputMethodManagerImpl::EnableInputMethodImpl(
     const std::string& input_method_id,
     std::vector<std::string>* new_active_input_method_ids) const {
   DCHECK(new_active_input_method_ids);
   if (!util_.IsValidInputMethodId(input_method_id)) {
     DVLOG(1) << "EnableInputMethod: Invalid ID: " << input_method_id;
     return false;
@@ skipping 404 matching lines @@
   if (active_input_method_ids_.empty()) {
     DVLOG(1) << "active input method is empty";
     return false;
   }
 
   // Get the list of input method ids for the |accelerator|. For example, get
   // { "mozc-hangul", "xkb:kr:kr104:kor" } for ui::VKEY_DBE_SBCSCHAR.
   std::vector<std::string> input_method_ids_to_switch;
   switch (accelerator.key_code()) {
     case ui::VKEY_CONVERT:  // Henkan key on JP106 keyboard
-      input_method_ids_to_switch.push_back(nacl_mozc_jp_id);
+      input_method_ids_to_switch.push_back(
+          extension_ime_util::GetInputMethodIDByEngineID("nacl_mozc_jp"));
       break;
     case ui::VKEY_NONCONVERT:  // Muhenkan key on JP106 keyboard
-      input_method_ids_to_switch.push_back("xkb:jp::jpn");
+      input_method_ids_to_switch.push_back(
+          extension_ime_util::GetInputMethodIDByEngineID("xkb:jp::jpn"));
       break;
     case ui::VKEY_DBE_SBCSCHAR:  // ZenkakuHankaku key on JP106 keyboard
     case ui::VKEY_DBE_DBCSCHAR:
-      input_method_ids_to_switch.push_back(nacl_mozc_jp_id);
-      input_method_ids_to_switch.push_back("xkb:jp::jpn");
+      input_method_ids_to_switch.push_back(
+          extension_ime_util::GetInputMethodIDByEngineID("nacl_mozc_jp"));
+      input_method_ids_to_switch.push_back(
+          extension_ime_util::GetInputMethodIDByEngineID("xkb:jp::jpn"));
       break;
     default:
       NOTREACHED();
       break;
   }
   if (input_method_ids_to_switch.empty()) {
     DVLOG(1) << "Unexpected VKEY: " << accelerator.key_code();
     return false;
   }
 
-  MigrateXkbInputMethods(&input_method_ids_to_switch);
-
   // Obtain the intersection of input_method_ids_to_switch and
   // active_input_method_ids_. The order of IDs in active_input_method_ids_ is
   // preserved.
   std::vector<std::string> ids;
   for (size_t i = 0; i < input_method_ids_to_switch.size(); ++i) {
     const std::string& id = input_method_ids_to_switch[i];
     if (Contains(active_input_method_ids_, id))
       ids.push_back(id);
   }
   if (ids.empty()) {
@@ skipping 165 matching lines @@
       CandidateWindowController::CreateCandidateWindowController());
   candidate_window_controller_->AddObserver(this);
 }
 
 Profile* InputMethodManagerImpl::GetProfile() const {
   return ProfileManager::GetActiveUserProfile();
 }
 
 }  // namespace input_method
 }  // namespace chromeos