Support custom icon in search result.

chrome/browser/chromeos/launcher_search_provider/service.cc

 // Copyright 2015 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/launcher_search_provider/service.h"
 
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/launcher_search_provider/service_factory.h"
 #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h"
@@ skipping 81 matching lines @@
       extensions::EventRouter::Get(profile_);
   event_router->DispatchEventToExtension(
       extension_id,
       make_scoped_ptr(new extensions::Event(
           api_launcher_search_provider::OnOpenResult::kEventName,
           api_launcher_search_provider::OnOpenResult::Create(item_id))));
 }
 
 void Service::SetSearchResults(
     const extensions::Extension* extension,
+    scoped_ptr<ErrorReporter> error_reporter,
     const std::string& query_id,
     const std::vector<linked_ptr<
         extensions::api::launcher_search_provider::SearchResult>>& results) {
   // If query is not running or query_id is different from current query id,
   // discard the results.
   if (!is_query_running_ || query_id != std::to_string(query_id_))
     return;
 
   // If |extension| is not in the listener extensions list, ignore it.
   if (!ContainsValue(GetListenerExtensionIds(), extension->id()))
     return;
 
   // Set search results to provider.
   DCHECK(provider_);
   ScopedVector<app_list::LauncherSearchResult> search_results;
   for (const auto& result : results) {
     const int relevance =
         std::min(kMaxSearchResultScore, std::max(result->relevance, 0));
     const GURL icon_url =
         result->icon_url ? GURL(*result->icon_url.get()) : GURL();
 
     app_list::LauncherSearchResult* search_result =
         new app_list::LauncherSearchResult(result->item_id, icon_url, relevance,
-                                           profile_, extension);
+                                           profile_, extension,
+                                           error_reporter->Duplicate());
     search_result->set_title(base::UTF8ToUTF16(result->title));
     search_results.push_back(search_result);
   }
   provider_->SetSearchResults(extension->id(), search_results.Pass());
 }
 
 bool Service::IsQueryRunning() const {
   return is_query_running_;
 }
 
 std::set<ExtensionId> Service::GetListenerExtensionIds() {
+  // TODO(yawano): Cache this result for optimization (crbug.com/440649).
   std::set<ExtensionId> extension_ids;
 
   const ExtensionSet& extension_set = extension_registry_->enabled_extensions();
   for (scoped_refptr<const extensions::Extension> extension : extension_set) {
     const extensions::PermissionsData* permission_data =
         extension->permissions_data();
     const bool has_permission = permission_data->HasAPIPermission(
         extensions::APIPermission::kLauncherSearchProvider);
     if (has_permission)
       extension_ids.insert(extension->id());
   }
 
   return extension_ids;
 }
 
 }  // namespace launcher_search_provider
 }  // namespace chromeos