App Launcher: Webstore results are now highlighted.

chrome/browser/ui/app_list/search/app_result.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/ui/app_list/search/app_result.h"
 
 #include "base/time/time.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_context_menu.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/search/search_util.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
 #include "chrome/common/extensions/extension_metrics.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_system_provider.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "ui/app_list/app_list_switches.h"
-#include "ui/app_list/search/tokenized_string.h"
-#include "ui/app_list/search/tokenized_string_match.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
 namespace app_list {
 
 AppResult::AppResult(Profile* profile,
                      const std::string& app_id,
                      AppListControllerDelegate* controller,
                      bool is_recommendation)
     : profile_(profile),
@@ skipping 20 matching lines @@
                                 this));
   UpdateIcon();
 
   StartObservingExtensionRegistry();
 }
 
 AppResult::~AppResult() {
   StopObservingExtensionRegistry();
 }
 
-void AppResult::UpdateFromMatch(const TokenizedString& title,
-                                const TokenizedStringMatch& match) {
-  const TokenizedStringMatch::Hits& hits = match.hits();
-
-  Tags tags;
-  tags.reserve(hits.size());
-  for (size_t i = 0; i < hits.size(); ++i)
-    tags.push_back(Tag(Tag::MATCH, hits[i].start(), hits[i].end()));
-
-  set_title(title.text());
-  set_title_tags(tags);
-  set_relevance(match.relevance());
-}
-
 void AppResult::UpdateFromLastLaunched(const base::Time& current_time,
                                        const base::Time& last_launched) {
   base::TimeDelta delta = current_time - last_launched;
   // |current_time| can be before |last_launched| in weird cases such as users
   // playing with their clocks. Handle this gracefully.
   if (current_time < last_launched) {
     set_relevance(1.0);
     return;
   }
 
@@ skipping 30 matching lines @@
       AppListControllerDelegate::LAUNCH_FROM_APP_LIST_SEARCH,
       event_flags);
 }
 
 scoped_ptr<SearchResult> AppResult::Duplicate() const {
   scoped_ptr<SearchResult> copy(
       new AppResult(profile_, app_id_, controller_,
                     display_type() == DISPLAY_RECOMMENDATION));
   copy->set_title(title());
   copy->set_title_tags(title_tags());
+  copy->set_relevance(relevance());

[calamity, 2015/04/30 06:36:06]

Hmm... Why was this not here before...?

[Matt Giuca, 2015/05/11 04:53:21]

Is not strictly necessary as the only caller of Duplicate sets the relevance to
a new value immediately after. But it's a mistake to not have it.

 
   return copy.Pass();
 }
 
 ui::MenuModel* AppResult::GetContextMenuModel() {
   if (!context_menu_) {
     context_menu_.reset(new AppContextMenu(
         this, profile_, app_id_, controller_));
     context_menu_->set_is_platform_app(is_platform_app_);
     context_menu_->set_is_search_result(true);
@@ skipping 67 matching lines @@
                                   const extensions::Extension* extension) {
   UpdateIcon();
 }
 
 void AppResult::OnShutdown(extensions::ExtensionRegistry* registry) {
   DCHECK_EQ(extension_registry_, registry);
   StopObservingExtensionRegistry();
 }
 
 }  // namespace app_list