| Index: chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h
|
| diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h
|
| index 913987ae10ecf9a340a4b650832137db5a97d3ab..4648427febbdf6682e7a754cfd0520707f395eff 100644
|
| --- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h
|
| +++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h
|
| @@ -32,34 +32,18 @@ class ComponentExtensionIMEManagerImpl
|
| virtual void Unload(const std::string& extension_id,
|
| const base::FilePath& file_path) OVERRIDE;
|
|
|
| - // Loads extension list and reads their manifest file. After finished
|
| - // initialization, |callback| will be called on original thread.
|
| - void InitializeAsync(const base::Closure& callback);
|
| -
|
| - // Returns true if this class is initialized and ready to use, otherwise
|
| - // returns false.
|
| - bool IsInitialized();
|
| -
|
| private:
|
| // Reads component extensions and extract their localized information: name,
|
| - // description and ime id. This function fills them into |out_imes|. This
|
| - // function must be called on file thread.
|
| + // description and ime id. This function fills them into |out_imes|.
|
| static void ReadComponentExtensionsInfo(
|
| std::vector<ComponentExtensionIME>* out_imes);
|
|
|
| - // This function is called on UI thread after ReadComponentExtensionsInfo
|
| - // function is finished. No need to release |result|.
|
| - void OnReadComponentExtensionsInfo(std::vector<ComponentExtensionIME>* result,
|
| - const base::Closure& callback);
|
| -
|
| - // Reads manifest.json file in |file_path|. This function must be called on
|
| - // file thread.
|
| + // Parses manifest string to manifest json dictionary value.
|
| static scoped_ptr<base::DictionaryValue> GetManifest(
|
| - const base::FilePath& file_path);
|
| + const std::string& manifest_string);
|
|
|
| // Reads extension information: description, option page. This function
|
| - // returns true on success, otherwise returns false. This function must be
|
| - // called on file thread.
|
| + // returns true on success, otherwise returns false.
|
| static bool ReadExtensionInfo(const base::DictionaryValue& manifest,
|
| const std::string& extension_id,
|
| ComponentExtensionIME* out);
|
| @@ -72,9 +56,6 @@ class ComponentExtensionIMEManagerImpl
|
| const base::DictionaryValue& dict,
|
| ComponentExtensionEngine* out);
|
|
|
| - // True if initialized.
|
| - bool is_initialized_;
|
| -
|
| // The list of component extension IME.
|
| std::vector<ComponentExtensionIME> component_extension_list_;
|
|
|
|
|