Index: chrome/common/extensions/api/input_ime/input_components_handler.cc |
diff --git a/chrome/common/extensions/api/input_ime/input_components_handler.cc b/chrome/common/extensions/api/input_ime/input_components_handler.cc |
index 67a1c95d9374a1ea12016d6fabf22f14814d0cf0..ec970a1b5d98ce95923553a90ae5c57e73bb9a07 100644 |
--- a/chrome/common/extensions/api/input_ime/input_components_handler.cc |
+++ b/chrome/common/extensions/api/input_ime/input_components_handler.cc |
@@ -64,6 +64,7 @@ bool InputComponentsHandler::Parse(Extension* extension, |
std::set<std::string> layouts; |
std::string shortcut_keycode_str; |
GURL input_view_url; |
+ GURL options_page_url; |
bool shortcut_alt = false; |
bool shortcut_ctrl = false; |
bool shortcut_shift = false; |
@@ -194,6 +195,18 @@ bool InputComponentsHandler::Parse(Extension* extension, |
} |
} |
+ // Get input_components[i].options_page_url. |
+ // Note: 'options_page' is optional in manifest. |
+ std::string options_page_str; |
+ if (module_value->GetString(keys::kImeOptionsPage, &options_page_str)) { |
+ options_page_url = extension->GetResourceURL(options_page_str); |
not at google - send to devlin
2014/01/16 01:04:26
Maybe you should warn if this isn't valid, as a de
Shu Chen
2014/01/16 05:52:15
I don't think it's necessary to install warnings o
not at google - send to devlin
2014/01/16 17:51:14
Ok thanks, sorry about that.
|
+ } |
+ if (!options_page_url.is_valid()) { |
+ // Fall back to extension's options page. |
+ // This is for backward compatibility. |
+ options_page_url = extensions::ManifestURL::GetOptionsPage(extension); |
+ } |
+ |
info->input_components.push_back(InputComponentInfo()); |
info->input_components.back().name = name_str; |
info->input_components.back().type = type; |
@@ -206,8 +219,7 @@ bool InputComponentsHandler::Parse(Extension* extension, |
info->input_components.back().shortcut_alt = shortcut_alt; |
info->input_components.back().shortcut_ctrl = shortcut_ctrl; |
info->input_components.back().shortcut_shift = shortcut_shift; |
- info->input_components.back().options_page_url = |
- extensions::ManifestURL::GetOptionsPage(extension); |
+ info->input_components.back().options_page_url = options_page_url; |
info->input_components.back().input_view_url = input_view_url; |
} |
extension->SetManifestData(keys::kInputComponents, info.release()); |