Move the InputComponents out of extensions entirely.

chrome/common/extensions/extension.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 
 #include <algorithm>
 #include <iosfwd>
 #include <map>
@@ skipping 157 matching lines @@
     FilePath path;  // Path to the plugin.
     bool is_public;  // False if only this extension can load this plugin.
   };
 
   // An NaCl module included in the extension.
   struct NaClModuleInfo {
     GURL url;
     std::string mime_type;
   };
 
-  enum InputComponentType {
-    INPUT_COMPONENT_TYPE_NONE = -1,
-    INPUT_COMPONENT_TYPE_IME,
-    INPUT_COMPONENT_TYPE_COUNT
-  };
-
-  struct InputComponentInfo {
-    // Define out of line constructor/destructor to please Clang.
-    InputComponentInfo();
-    ~InputComponentInfo();
-
-    std::string name;
-    InputComponentType type;
-    std::string id;
-    std::string description;
-    std::string language;
-    std::set<std::string> layouts;
-    std::string shortcut_keycode;
-    bool shortcut_alt;
-    bool shortcut_ctrl;
-    bool shortcut_shift;
-  };
-
   struct TtsVoice {
     // Define out of line constructor/destructor to please Clang.
     TtsVoice();
     ~TtsVoice();
 
     std::string voice_name;
     std::string lang;
     std::string gender;
     std::set<std::string> event_types;
   };
@@ skipping 483 matching lines @@
   const ActionInfo* browser_action_info() const {
     return browser_action_info_.get();
   }
   const ActionInfo* system_indicator_info() const {
     return system_indicator_info_.get();
   }
   const std::vector<PluginInfo>& plugins() const { return plugins_; }
   const std::vector<NaClModuleInfo>& nacl_modules() const {
     return nacl_modules_;
   }
-  const std::vector<InputComponentInfo>& input_components() const {
-    return input_components_;
-  }
   // The browser action command that the extension wants to use, which is not
   // necessarily the one it can use, as it might be inactive (see also
   // GetBrowserActionCommand in CommandService).
   const extensions::Command* browser_action_command() const {
     return browser_action_command_.get();
   }
   // The page action command that the extension wants to use, which is not
   // necessarily the one it can use, as it might be inactive (see also
   // GetPageActionCommand in CommandService).
   const extensions::Command* page_action_command() const {
@@ skipping 221 matching lines @@
                            string16* error);
   bool LoadWebIntentServices(string16* error);
   bool LoadFileHandler(const std::string& handler_id,
                        const base::DictionaryValue& handler_info,
                        string16* error);
   bool LoadFileHandlers(string16* error);
   bool LoadExtensionFeatures(APIPermissionSet* api_permissions,
                              string16* error);
   bool LoadManifestHandlerFeatures(string16* error);
   bool LoadDevToolsPage(string16* error);
-  bool LoadInputComponents(const APIPermissionSet& api_permissions,
-                           string16* error);
   bool LoadContentScripts(string16* error);
   bool LoadPageAction(string16* error);
   bool LoadBrowserAction(string16* error);
   bool LoadScriptBadge(string16* error);
   bool LoadSystemIndicator(APIPermissionSet* api_permissions, string16* error);
   bool LoadChromeURLOverrides(string16* error);
   bool LoadTextToSpeechVoices(string16* error);
   bool LoadIncognitoMode(string16* error);
   bool LoadContentSecurityPolicy(string16* error);
 
@@ skipping 148 matching lines @@
 
   // The extension's system indicator, if any.
   scoped_ptr<ActionInfo> system_indicator_info_;
 
   // Optional list of NPAPI plugins and associated properties.
   std::vector<PluginInfo> plugins_;
 
   // Optional list of NaCl modules and associated properties.
   std::vector<NaClModuleInfo> nacl_modules_;
 
-  // Optional list of input components and associated properties.
-  std::vector<InputComponentInfo> input_components_;
-
   // Optional list of commands (keyboard shortcuts).
   scoped_ptr<extensions::Command> browser_action_command_;
   scoped_ptr<extensions::Command> page_action_command_;
   scoped_ptr<extensions::Command> script_badge_command_;
   extensions::CommandMap named_commands_;
 
   // Optional list of web accessible extension resources.
   URLPatternSet web_accessible_resources_;
 
   // Optional list of extension pages that are sandboxed (served from a unique
@@ skipping 183 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_