app_list: Search result launch history and boost.

chrome/browser/ui/app_list/search/search_controller.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/search_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/search/app_search_provider.h"
 #include "chrome/browser/ui/app_list/search/chrome_search_result.h"
+#include "chrome/browser/ui/app_list/search/history.h"
+#include "chrome/browser/ui/app_list/search/history_factory.h"
 #include "chrome/browser/ui/app_list/search/omnibox_provider.h"
 #include "chrome/browser/ui/app_list/search/search_provider.h"
 #include "chrome/browser/ui/app_list/search/webstore_provider.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace app_list {
 
 SearchController::SearchController(Profile* profile,
                                    SearchBoxModel* search_box,
                                    AppListModel::SearchResults* results,
                                    AppListControllerDelegate* list_controller)
   : profile_(profile),
     search_box_(search_box),
     list_controller_(list_controller),
     dispatching_query_(false),
-    mixer_(new Mixer(results)) {
+    mixer_(new Mixer(results)),
+    history_(HistoryFactory::GetForBrowserContext(profile)) {
   Init();
 }
 
 SearchController::~SearchController() {}
 
 void SearchController::Init() {
   search_box_->SetHintText(
       l10n_util::GetStringUTF16(IDS_SEARCH_BOX_HINT));
   search_box_->SetIcon(*ui::ResourceBundle::GetSharedInstance().
       GetImageSkiaNamed(IDR_OMNIBOX_SEARCH));
@@ skipping 39 matching lines @@
        it != providers_.end();
        ++it) {
     (*it)->Stop();
   }
 }
 
 void SearchController::OpenResult(SearchResult* result, int event_flags) {
   // Count AppList.Search here because it is composed of search + action.
   content::RecordAction(content::UserMetricsAction("AppList_Search"));
 
-  // TODO(xiyuan): Hook up with user learning.
-  static_cast<app_list::ChromeSearchResult*>(result)->Open(event_flags);
+  ChromeSearchResult* chrome_result =
+      static_cast<app_list::ChromeSearchResult*>(result);
+  chrome_result->Open(event_flags);
+
+  if (history_ && history_->IsReady()) {
+    history_->AddLaunchEvent(UTF16ToUTF8(search_box_->text()),
+                             chrome_result->id());
+  }
 }
 
 void SearchController::InvokeResultAction(SearchResult* result,
                                           int action_index,
                                           int event_flags) {
   // TODO(xiyuan): Hook up with user learning.
   static_cast<app_list::ChromeSearchResult*>(result)->InvokeAction(
       action_index, event_flags);
 }
 
 void SearchController::AddProvider(Mixer::GroupId group,
                                    scoped_ptr<SearchProvider> provider) {
   provider->set_result_changed_callback(base::Bind(
       &SearchController::OnResultsChanged,
       base::Unretained(this)));
   mixer_->AddProviderToGroup(group, provider.get());
   providers_.push_back(provider.release());  // Takes ownership.
 }
 
 void SearchController::OnResultsChanged() {
   if (dispatching_query_)
     return;
 
-  mixer_->MixAndPublish();
+  KnownResults known_results;
+  if (history_ && history_->IsReady()) {
+    history_->GetKnownResults(UTF16ToUTF8(search_box_->text()))
+        ->swap(known_results);
+  }
+
+  mixer_->MixAndPublish(known_results);
 }
 
 }  // namespace app_list