Support options page handling into ComponentExtensionManager.

chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc

 // Copyright 2013 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/chromeos/input_method/component_extension_ime_manager_impl.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#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"
 
 namespace chromeos {
 
 namespace {
 
 struct WhitelistedComponentExtensionIME {
@@ skipping 121 matching lines @@
   if (layouts->GetSize() > 0) {
     if (!layouts->GetString(0, &out->layout))
       return false;
   }
   return true;
 }
 
 // static
 bool ComponentExtensionIMEManagerImpl::ReadExtensionInfo(
     const DictionaryValue& manifest,
+    const std::string& extension_id,
     ComponentExtensionIME* out) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   if (!manifest.GetString(extension_manifest_keys::kDescription,
                           &out->description))
     return false;
-  // TODO(nona): option page handling.
+  std::string url_string;
+  if (!manifest.GetString(extension_manifest_keys::kOptionsPage, &url_string))
+    return true;  // It's okay to return true on no option page case.
+
+  GURL gurl = extensions::Extension::GetResourceURL(

[satorux1, 2013/04/15 04:16:08]

gurl -> url

[Seigo Nonaka, 2013/04/15 04:25:53]

Done.

+      extensions::Extension::GetBaseURLFromExtensionId(extension_id),
+      url_string);
+  if (!gurl.is_valid())
+    return false;
+  out->options_page_url = gurl.spec();
   return true;
 }
 
 // static
 void ComponentExtensionIMEManagerImpl::ReadComponentExtensionsInfo(
     std::vector<ComponentExtensionIME>* out_imes) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   DCHECK(out_imes);
   for (size_t i = 0; i < arraysize(whitelisted_component_extension); ++i) {
     ComponentExtensionIME component_ime;
     component_ime.path = base::FilePath(
         whitelisted_component_extension[i].path);
 
     const base::FilePath manifest_path =
         component_ime.path.Append("manifest.json");
 
     if (!file_util::PathExists(component_ime.path) ||
         !file_util::PathExists(manifest_path))
       continue;
 
     if (!file_util::ReadFileToString(manifest_path, &component_ime.manifest))
       continue;
 
     scoped_ptr<DictionaryValue> manifest = GetManifest(component_ime.path);
     if (!manifest.get())
       continue;
 
-    if (!ReadExtensionInfo(*manifest.get(), &component_ime))
+    if (!ReadExtensionInfo(*manifest.get(),
+                           whitelisted_component_extension[i].id,
+                           &component_ime))
       continue;
     component_ime.id = whitelisted_component_extension[i].id;
 
     const ListValue* component_list;
     if (!manifest->GetList(extension_manifest_keys::kInputComponents,
                            &component_list))
       continue;
 
     for (size_t i = 0; i < component_list->GetSize(); ++i) {
       const DictionaryValue* dictionary;
@@ skipping 12 matching lines @@
     std::vector<ComponentExtensionIME>* result,
     const base::Closure& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(result);
   component_extension_list_ = *result;
   is_initialized_ = true;
   callback.Run();
 }
 
 }  // namespace chromeos