Commit 7ef34fc8 authored by Jiaquan He's avatar Jiaquan He Committed by Commit Bot

app_list: remove top_level_item_list from AppResult.

It's not used.

Bug: 733662
Change-Id: I3b69a62a9a53a2a732bc0ed461d593ab119cdddd
Reviewed-on: https://chromium-review.googlesource.com/806747Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Jiaquan He <hejq@google.com>
Cr-Commit-Position: refs/heads/master@{#521463}
parent 8c4132ed
...@@ -6,8 +6,11 @@ ...@@ -6,8 +6,11 @@
#include <stddef.h> #include <stddef.h>
#include <algorithm>
#include <map> #include <map>
#include <set>
#include <string> #include <string>
#include <unordered_set>
#include <utility> #include <utility>
#include "ash/app_list/model/app_list_item.h" #include "ash/app_list/model/app_list_item.h"
...@@ -146,7 +149,6 @@ class AppSearchProvider::DataSource { ...@@ -146,7 +149,6 @@ class AppSearchProvider::DataSource {
virtual std::unique_ptr<AppResult> CreateResult( virtual std::unique_ptr<AppResult> CreateResult(
const std::string& app_id, const std::string& app_id,
AppListControllerDelegate* list_controller, AppListControllerDelegate* list_controller,
AppListItemList* top_level_item_list,
bool is_recommended) = 0; bool is_recommended) = 0;
protected: protected:
...@@ -184,7 +186,6 @@ class ExtensionDataSource : public AppSearchProvider::DataSource, ...@@ -184,7 +186,6 @@ class ExtensionDataSource : public AppSearchProvider::DataSource,
std::unique_ptr<AppResult> CreateResult( std::unique_ptr<AppResult> CreateResult(
const std::string& app_id, const std::string& app_id,
AppListControllerDelegate* list_controller, AppListControllerDelegate* list_controller,
AppListItemList* top_level_item_list,
bool is_recommended) override { bool is_recommended) override {
return base::MakeUnique<ExtensionAppResult>( return base::MakeUnique<ExtensionAppResult>(
profile(), app_id, list_controller, is_recommended); profile(), app_id, list_controller, is_recommended);
...@@ -272,7 +273,6 @@ class ArcDataSource : public AppSearchProvider::DataSource, ...@@ -272,7 +273,6 @@ class ArcDataSource : public AppSearchProvider::DataSource,
std::unique_ptr<AppResult> CreateResult( std::unique_ptr<AppResult> CreateResult(
const std::string& app_id, const std::string& app_id,
AppListControllerDelegate* list_controller, AppListControllerDelegate* list_controller,
AppListItemList* top_level_item_list,
bool is_recommended) override { bool is_recommended) override {
return base::MakeUnique<ArcAppResult>(profile(), app_id, list_controller, return base::MakeUnique<ArcAppResult>(profile(), app_id, list_controller,
is_recommended); is_recommended);
...@@ -354,8 +354,8 @@ void AppSearchProvider::UpdateResults() { ...@@ -354,8 +354,8 @@ void AppSearchProvider::UpdateResults() {
id_to_app_list_index[top_level_item_list_->item_at(i)->id()] = i; id_to_app_list_index[top_level_item_list_->item_at(i)->id()] = i;
for (auto& app : apps_) { for (auto& app : apps_) {
std::unique_ptr<AppResult> result = app->data_source()->CreateResult( std::unique_ptr<AppResult> result =
app->id(), list_controller_, top_level_item_list_, true); app->data_source()->CreateResult(app->id(), list_controller_, true);
result->set_title(app->name()); result->set_title(app->name());
// Use the app list order to tiebreak apps that have never been launched. // Use the app list order to tiebreak apps that have never been launched.
...@@ -380,8 +380,8 @@ void AppSearchProvider::UpdateResults() { ...@@ -380,8 +380,8 @@ void AppSearchProvider::UpdateResults() {
} else { } else {
const TokenizedString query_terms(query_); const TokenizedString query_terms(query_);
for (auto& app : apps_) { for (auto& app : apps_) {
std::unique_ptr<AppResult> result = app->data_source()->CreateResult( std::unique_ptr<AppResult> result =
app->id(), list_controller_, top_level_item_list_, false); app->data_source()->CreateResult(app->id(), list_controller_, false);
TokenizedStringMatch match; TokenizedStringMatch match;
TokenizedString* indexed_name = app->GetTokenizedIndexedName(); TokenizedString* indexed_name = app->GetTokenizedIndexedName();
if (!match.Calculate(query_terms, *indexed_name)) if (!match.Calculate(query_terms, *indexed_name))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment