| Index: chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
|
| diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
|
| index 376b90a12d0de0246c9d89632802e93191768dde..2a61f8938ad9884137893893176421b009a005b9 100644
|
| --- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
|
| +++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
|
| @@ -14,8 +14,8 @@
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_file_util.h"
|
| #include "chrome/common/extensions/extension_l10n_util.h"
|
| -#include "chrome/common/extensions/extension_manifest_constants.h"
|
| #include "content/public/browser/browser_thread.h"
|
| +#include "extensions/common/manifest_constants.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| namespace chromeos {
|
| @@ -177,18 +177,18 @@ bool ComponentExtensionIMEManagerImpl::ReadEngineComponent(
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
|
| DCHECK(out);
|
| std::string type;
|
| - if (!dict.GetString(extension_manifest_keys::kType, &type))
|
| + if (!dict.GetString(extensions::manifest_keys::kType, &type))
|
| return false;
|
| if (type != "ime")
|
| return false;
|
| - if (!dict.GetString(extension_manifest_keys::kId, &out->engine_id))
|
| + if (!dict.GetString(extensions::manifest_keys::kId, &out->engine_id))
|
| return false;
|
| - if (!dict.GetString(extension_manifest_keys::kName, &out->display_name))
|
| + if (!dict.GetString(extensions::manifest_keys::kName, &out->display_name))
|
| return false;
|
|
|
| std::set<std::string> languages;
|
| const base::Value* language_value = NULL;
|
| - if (dict.Get(extension_manifest_keys::kLanguage, &language_value)) {
|
| + if (dict.Get(extensions::manifest_keys::kLanguage, &language_value)) {
|
| if (language_value->GetType() == base::Value::TYPE_STRING) {
|
| std::string language_str;
|
| language_value->GetAsString(&language_str);
|
| @@ -207,7 +207,7 @@ bool ComponentExtensionIMEManagerImpl::ReadEngineComponent(
|
| out->language_codes.assign(languages.begin(), languages.end());
|
|
|
| const ListValue* layouts = NULL;
|
| - if (!dict.GetList(extension_manifest_keys::kLayouts, &layouts))
|
| + if (!dict.GetList(extensions::manifest_keys::kLayouts, &layouts))
|
| return false;
|
|
|
| for (size_t i = 0; i < layouts->GetSize(); ++i) {
|
| @@ -224,11 +224,11 @@ bool ComponentExtensionIMEManagerImpl::ReadExtensionInfo(
|
| const std::string& extension_id,
|
| ComponentExtensionIME* out) {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
|
| - if (!manifest.GetString(extension_manifest_keys::kDescription,
|
| + if (!manifest.GetString(extensions::manifest_keys::kDescription,
|
| &out->description))
|
| return false;
|
| std::string url_string;
|
| - if (!manifest.GetString(extension_manifest_keys::kOptionsPage, &url_string))
|
| + if (!manifest.GetString(extensions::manifest_keys::kOptionsPage, &url_string))
|
| return true; // It's okay to return true on no option page case.
|
|
|
| GURL url = extensions::Extension::GetResourceURL(
|
| @@ -271,7 +271,7 @@ void ComponentExtensionIMEManagerImpl::ReadComponentExtensionsInfo(
|
| component_ime.id = whitelisted_component_extension[i].id;
|
|
|
| const ListValue* component_list;
|
| - if (!manifest->GetList(extension_manifest_keys::kInputComponents,
|
| + if (!manifest->GetList(extensions::manifest_keys::kInputComponents,
|
| &component_list))
|
| continue;
|
|
|
|
|