Remove API elements that are no longer in the IME API design document

chrome/browser/extensions/extension_input_ime_api.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/extensions/extension_input_ime_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
@@ skipping 80 matching lines @@
       modified |= chromeos::InputMethodEngine::MENU_ITEM_MODIFIED_CHECKED;
     }
 
     if (item_dict->HasKey(keys::kEnabledKey)) {
       if (!item_dict->GetBoolean(keys::kEnabledKey, &enabled)) {
         return false;
       }
       modified |= chromeos::InputMethodEngine::MENU_ITEM_MODIFIED_ENABLED;
     }
 
-    if (item_dict->HasKey(keys::kIconKey)) {
-      if (!item_dict->GetString(keys::kIconKey, &icon)) {
-        return false;
-      }
-      modified |= chromeos::InputMethodEngine::MENU_ITEM_MODIFIED_ICON;
-    }
-
-    if (item_dict->HasKey(keys::kShortcutKey)) {
-      DictionaryValue* shortcut_dict;
-      if (!item_dict->GetDictionary(keys::kShortcutKey, &shortcut_dict)) {
-        return false;
-      }
-
-      if (!shortcut_dict->GetString(keys::kKeyKey, &(shortcut_key.key))) {
-        return false;
-      }
-
-      if (shortcut_dict->HasKey(keys::kAltKeyKey)) {
-        if (!item_dict->GetBoolean(keys::kAltKeyKey, &(shortcut_key.alt_key))) {
-          return false;
-        }
-      }
-
-      if (shortcut_dict->HasKey(keys::kCtrlKeyKey)) {
-        if (!shortcut_dict->GetBoolean(keys::kCtrlKeyKey,
-                                       &(shortcut_key.ctrl_key))) {
-          return false;
-        }
-      }
-
-      if (shortcut_dict->HasKey(keys::kShiftKeyKey)) {
-        if (!shortcut_dict->GetBoolean(keys::kShiftKeyKey,
-                                       &(shortcut_key.shift_key))) {
-          return false;
-        }
-      }
-      modified |= chromeos::InputMethodEngine::MENU_ITEM_MODIFIED_SHORTCUT_KEY;
-    }
-
     output->push_back(chromeos::InputMethodEngine::MenuItem());
     output->back().id = id;
     output->back().label = label;
     output->back().style = style;
     output->back().visible = visible;
     output->back().enabled = enabled;
     output->back().checked = checked;
-    output->back().icon = icon;
-    output->back().shortcut_key = shortcut_key;
 
     output->back().modified = modified;
 
     if (item_dict->HasKey(keys::kItemsKey)) {
       ListValue* sub_list;
       if (!item_dict->GetList(keys::kItemsKey, &sub_list)) {
         return false;
       }
 
       if (!ReadMenuItems(sub_list, &(output->back().children))) {
@@ skipping 117 matching lines @@
       return;
 
     std::string request_id =
         ExtensionInputImeEventRouter::GetInstance()->AddRequest(engine_id,
                                                                 key_data);
 
     DictionaryValue* dict = new DictionaryValue();
     dict->SetString("type", event.type);
     dict->SetString("requestId", request_id);
     dict->SetString("key", event.key);
-    dict->SetString("keyCode", event.key_code);
     dict->SetBoolean("altKey", event.alt_key);
     dict->SetBoolean("ctrlKey", event.ctrl_key);
     dict->SetBoolean("shiftKey", event.shift_key);
 
     ListValue args;
     args.Append(Value::CreateStringValue(engine_id));
     args.Append(dict);
 
     std::string json_args;
     base::JSONWriter::Write(&args, false, &json_args);
@@ skipping 88 matching lines @@
   std::map<std::string, chromeos::InputMethodEngine*>::iterator engine_ix =
       engine_map.find(component.id);
   if (engine_ix != engine_map.end()) {
     return false;
   }
 
   std::string error;
   chromeos::ImeObserver* observer = new chromeos::ImeObserver(profile,
                                                               extension_id,
                                                               component.id);
-  chromeos::InputMethodEngine::KeyboardEvent shortcut_key;
-  shortcut_key.key = component.shortcut_keycode;
-  shortcut_key.key_code = component.shortcut_keycode;
-  shortcut_key.alt_key = component.shortcut_alt;
-  shortcut_key.ctrl_key = component.shortcut_ctrl;
-  shortcut_key.shift_key = component.shortcut_shift;
-
   std::vector<std::string> layouts;
   layouts.assign(component.layouts.begin(), component.layouts.end());
 
   chromeos::InputMethodEngine* engine =
       chromeos::InputMethodEngine::CreateEngine(
           observer, component.name.c_str(), extension_id.c_str(),
           component.id.c_str(), component.description.c_str(),
-          component.language.c_str(), layouts,
-          shortcut_key, &error);
+          component.language.c_str(), layouts, &error);
   if (!engine) {
     delete observer;
     LOG(ERROR) << "RegisterIme: " << error;
     return false;
   }
 
   engine_map[component.id] = engine;
 
   std::map<std::string, chromeos::ImeObserver*>& observer_list =
       observers_[extension_id];
@@ skipping 454 matching lines @@
 
   bool handled = false;
   EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(1, &handled));
 
   ExtensionInputImeEventRouter::GetInstance()->OnEventHandled(
       extension_id(), request_id_str, handled);
 
   return true;
 }
 #endif