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

chrome/browser/ui/webui/options/chromeos/cros_language_options_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/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 310 matching lines @@
     const base::ListValue* args) {
   const std::string input_method_id = UTF16ToASCII(ExtractStringValue(args));
   const std::string action = base::StringPrintf(
       "InputMethodOptions_Open_%s", input_method_id.c_str());
   content::RecordComputedAction(action);
 
   const std::string extension_id =
       extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id);
   if (extension_id.empty())
     return;
-  const extensions::Extension* extension =
-      extensions::ExtensionSystem::Get(Profile::FromWebUI(web_ui()))->
-          extension_service()->extensions()->GetByID(extension_id);
-  if (!extension ||
-      extensions::ManifestURL::GetOptionsPage(extension).is_empty()) {
+
+  base::string16 options_page_str16;

[not at google - send to devlin, 2014/01/16 01:04:26]

I'd feel more comfortable if we didn't trust what JS told us, and instead looked
up the input method from the extension via |input_method_id| and directly found
its options page URL that way.

[Shu Chen, 2014/01/16 05:52:15]

Done.

+  if (!args->GetString(1, &options_page_str16))
     return;
-  }
-  extensions::ExtensionTabUtil::OpenOptionsPage(
-      extension,
-      chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()));
+
+  Browser* browser = chrome::FindBrowserWithWebContents(
+      web_ui()->GetWebContents());
+  content::OpenURLParams params(GURL(options_page_str16),
+      content::Referrer(),
+      SINGLETON_TAB,
+      content::PAGE_TRANSITION_LINK,
+      false);
+  browser->OpenURL(params);
+  browser->window()->Show();
+  content::WebContents* web_contents =
+    browser->tab_strip_model()->GetActiveWebContents();
+  web_contents->GetDelegate()->ActivateContents(web_contents);
 }
 
 void CrosLanguageOptionsHandler::OnInitialized() {
   if (composition_extension_appended_ || !is_page_initialized_) {
     // If an option page is not ready to call JavaScript, appending component
     // extension IMEs will be done in InitializePage function later.
     return;
   }
 
   ComponentExtensionIMEManager* manager =
@@ skipping 28 matching lines @@
       ConvertInputMethodDescriptosToIMEList(
           component_extension_manager->GetAllIMEAsInputMethodDescriptor()));
   web_ui()->CallJavascriptFunction(
       "options.LanguageOptions.onComponentManagerInitialized",
       *ime_list);
   composition_extension_appended_ = true;
 }
 
 }  // namespace options
 }  // namespace chromeos