[IME] Supports options page for each IME instead of single options page for each IME extension.

chrome/common/extensions/api/input_ime/input_components_handler.cc

 // 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/common/extensions/api/input_ime/input_components_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 46 matching lines @@
   for (size_t i = 0; i < list_value->GetSize(); ++i) {
     const base::DictionaryValue* module_value = NULL;
     std::string name_str;
     InputComponentType type;
     std::string id_str;
     std::string description_str;
     std::set<std::string> languages;
     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;
 
     if (!list_value->GetDictionary(i, &module_value)) {
       *error = base::ASCIIToUTF16(errors::kInvalidInputComponents);
       return false;
     }
 
     // Get input_components[i].name.
@@ skipping 110 matching lines @@
     if (module_value->GetString(keys::kInputView, &input_view_str)) {
       input_view_url = extension->GetResourceURL(input_view_str);
       if (!input_view_url.is_valid()) {
         *error = ErrorUtils::FormatErrorMessageUTF16(
             errors::kInvalidInputView,
             base::IntToString(i));
         return false;
       }
     }
 
+    // Get input_components[i].options_page_url.
+    // Note: 'options_page_url' is optional in manifest.

[not at google - send to devlin, 2014/01/14 17:28:06]

it's just "options_page"?

[Shu Chen, 2014/01/15 05:24:54]

Done.

+    std::string options_page_str;
+    if (module_value->GetString(keys::kImeOptionsPage, &options_page_str)) {
+      options_page_url = extension->GetResourceURL(options_page_str);
+      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);
+      }
+    }

[kevers, 2014/01/14 19:33:08]

Missing else block?  options_page_url does not appear to be initialized if the
key is missing from the manifest.

[Shu Chen, 2014/01/15 05:24:54]

Done.

+
     info->input_components.push_back(InputComponentInfo());
     info->input_components.back().name = name_str;
     info->input_components.back().type = type;
     info->input_components.back().id = id_str;
     info->input_components.back().description = description_str;
     info->input_components.back().languages = languages;
     info->input_components.back().layouts.insert(layouts.begin(),
         layouts.end());
     info->input_components.back().shortcut_keycode = shortcut_keycode_str;
     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());
   return true;
 }
 
 const std::vector<std::string>
 InputComponentsHandler::PrerequisiteKeys() const {
   return SingleKey(keys::kOptionsPage);
 }
 
 const std::vector<std::string> InputComponentsHandler::Keys() const {
   return SingleKey(keys::kInputComponents);
 }
 
 }  // namespace extensions