Commit 2e8a2a7b authored by mgiuca's avatar mgiuca Committed by Commit bot

app_list::SearchResult: Duplicate() is const.

There is no reason for this method to be non-const.

TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/898273002

Cr-Commit-Position: refs/heads/master@{#315266}
parent d498522c
...@@ -192,7 +192,7 @@ class ExampleSearchResult : public app_list::SearchResult { ...@@ -192,7 +192,7 @@ class ExampleSearchResult : public app_list::SearchResult {
WindowTypeShelfItem::Type type() const { return type_; } WindowTypeShelfItem::Type type() const { return type_; }
// app_list::SearchResult: // app_list::SearchResult:
scoped_ptr<SearchResult> Duplicate() override { scoped_ptr<SearchResult> Duplicate() const override {
return scoped_ptr<SearchResult>(); return scoped_ptr<SearchResult>();
} }
......
...@@ -123,7 +123,7 @@ void AppResult::Open(int event_flags) { ...@@ -123,7 +123,7 @@ void AppResult::Open(int event_flags) {
event_flags); event_flags);
} }
scoped_ptr<SearchResult> AppResult::Duplicate() { scoped_ptr<SearchResult> AppResult::Duplicate() const {
scoped_ptr<SearchResult> copy( scoped_ptr<SearchResult> copy(
new AppResult(profile_, app_id_, controller_, new AppResult(profile_, app_id_, controller_,
display_type() == DISPLAY_RECOMMENDATION)); display_type() == DISPLAY_RECOMMENDATION));
......
...@@ -52,7 +52,7 @@ class AppResult : public SearchResult, ...@@ -52,7 +52,7 @@ class AppResult : public SearchResult,
// SearchResult overrides: // SearchResult overrides:
void Open(int event_flags) override; void Open(int event_flags) override;
scoped_ptr<SearchResult> Duplicate() override; scoped_ptr<SearchResult> Duplicate() const override;
ui::MenuModel* GetContextMenuModel() override; ui::MenuModel* GetContextMenuModel() override;
private: private:
......
...@@ -134,7 +134,7 @@ void OmniboxResult::Open(int event_flags) { ...@@ -134,7 +134,7 @@ void OmniboxResult::Open(int event_flags) {
ui::DispositionFromEventFlags(event_flags)); ui::DispositionFromEventFlags(event_flags));
} }
scoped_ptr<SearchResult> OmniboxResult::Duplicate() { scoped_ptr<SearchResult> OmniboxResult::Duplicate() const {
return scoped_ptr<SearchResult>(new OmniboxResult(profile_, list_controller_, return scoped_ptr<SearchResult>(new OmniboxResult(profile_, list_controller_,
autocomplete_controller_, autocomplete_controller_,
is_voice_query_, match_)); is_voice_query_, match_));
......
...@@ -27,7 +27,7 @@ class OmniboxResult : public SearchResult { ...@@ -27,7 +27,7 @@ class OmniboxResult : public SearchResult {
// SearchResult overrides: // SearchResult overrides:
void Open(int event_flags) override; void Open(int event_flags) override;
scoped_ptr<SearchResult> Duplicate() override; scoped_ptr<SearchResult> Duplicate() const override;
private: private:
void UpdateIcon(); void UpdateIcon();
......
...@@ -117,7 +117,7 @@ void PeopleResult::InvokeAction(int action_index, int event_flags) { ...@@ -117,7 +117,7 @@ void PeopleResult::InvokeAction(int action_index, int event_flags) {
} }
} }
scoped_ptr<SearchResult> PeopleResult::Duplicate() { scoped_ptr<SearchResult> PeopleResult::Duplicate() const {
return scoped_ptr<SearchResult>( return scoped_ptr<SearchResult>(
new PeopleResult(profile_, controller_, person_->Duplicate().Pass())); new PeopleResult(profile_, controller_, person_->Duplicate().Pass()));
} }
......
...@@ -29,7 +29,7 @@ class PeopleResult : public SearchResult { ...@@ -29,7 +29,7 @@ class PeopleResult : public SearchResult {
// SearchResult overrides: // SearchResult overrides:
void Open(int event_flags) override; void Open(int event_flags) override;
void InvokeAction(int action_index, int event_flags) override; void InvokeAction(int action_index, int event_flags) override;
scoped_ptr<SearchResult> Duplicate() override; scoped_ptr<SearchResult> Duplicate() const override;
private: private:
void OnIconLoaded(); void OnIconLoaded();
......
...@@ -58,7 +58,7 @@ void SearchWebstoreResult::Open(int event_flags) { ...@@ -58,7 +58,7 @@ void SearchWebstoreResult::Open(int event_flags) {
ui::DispositionFromEventFlags(event_flags)); ui::DispositionFromEventFlags(event_flags));
} }
scoped_ptr<SearchResult> SearchWebstoreResult::Duplicate() { scoped_ptr<SearchResult> SearchWebstoreResult::Duplicate() const {
return scoped_ptr<SearchResult>( return scoped_ptr<SearchResult>(
new SearchWebstoreResult(profile_, controller_, query_)); new SearchWebstoreResult(profile_, controller_, query_));
} }
......
...@@ -26,7 +26,7 @@ class SearchWebstoreResult : public SearchResult { ...@@ -26,7 +26,7 @@ class SearchWebstoreResult : public SearchResult {
// SearchResult overrides: // SearchResult overrides:
void Open(int event_flags) override; void Open(int event_flags) override;
scoped_ptr<SearchResult> Duplicate() override; scoped_ptr<SearchResult> Duplicate() const override;
private: private:
Profile* profile_; Profile* profile_;
......
...@@ -49,7 +49,7 @@ void URLSuggestionResult::Open(int event_flags) { ...@@ -49,7 +49,7 @@ void URLSuggestionResult::Open(int event_flags) {
ui::DispositionFromEventFlags(event_flags)); ui::DispositionFromEventFlags(event_flags));
} }
scoped_ptr<SearchResult> URLSuggestionResult::Duplicate() { scoped_ptr<SearchResult> URLSuggestionResult::Duplicate() const {
URLSuggestionResult* new_result = new URLSuggestionResult( URLSuggestionResult* new_result = new URLSuggestionResult(
profile_, list_controller_, favicon_service_, suggestions_service_, profile_, list_controller_, favicon_service_, suggestions_service_,
suggestion_); suggestion_);
......
...@@ -39,7 +39,7 @@ class URLSuggestionResult : public SearchResult { ...@@ -39,7 +39,7 @@ class URLSuggestionResult : public SearchResult {
// SearchResult overrides: // SearchResult overrides:
void Open(int event_flags) override; void Open(int event_flags) override;
scoped_ptr<SearchResult> Duplicate() override; scoped_ptr<SearchResult> Duplicate() const override;
// Refer to SearchResult::set_relevance for documentation. // Refer to SearchResult::set_relevance for documentation.
using SearchResult::set_relevance; using SearchResult::set_relevance;
......
...@@ -128,7 +128,7 @@ void WebstoreResult::InvokeAction(int action_index, int event_flags) { ...@@ -128,7 +128,7 @@ void WebstoreResult::InvokeAction(int action_index, int event_flags) {
StartInstall(action_index == kLaunchEphemeralAppAction); StartInstall(action_index == kLaunchEphemeralAppAction);
} }
scoped_ptr<SearchResult> WebstoreResult::Duplicate() { scoped_ptr<SearchResult> WebstoreResult::Duplicate() const {
return scoped_ptr<SearchResult>(new WebstoreResult(profile_, return scoped_ptr<SearchResult>(new WebstoreResult(profile_,
app_id_, app_id_,
localized_name_, localized_name_,
......
...@@ -47,7 +47,7 @@ class WebstoreResult : public SearchResult, ...@@ -47,7 +47,7 @@ class WebstoreResult : public SearchResult,
// SearchResult overrides: // SearchResult overrides:
void Open(int event_flags) override; void Open(int event_flags) override;
void InvokeAction(int action_index, int event_flags) override; void InvokeAction(int action_index, int event_flags) override;
scoped_ptr<SearchResult> Duplicate() override; scoped_ptr<SearchResult> Duplicate() const override;
private: private:
// Set the initial state and start observing both InstallObserver and // Set the initial state and start observing both InstallObserver and
......
...@@ -207,13 +207,13 @@ void Mixer::Publish(const SortedResults& new_results, ...@@ -207,13 +207,13 @@ void Mixer::Publish(const SortedResults& new_results,
// Add items back to |ui_results| in the order of |new_results|. // Add items back to |ui_results| in the order of |new_results|.
for (size_t i = 0; i < new_results.size(); ++i) { for (size_t i = 0; i < new_results.size(); ++i) {
SearchResult* new_result = new_results[i].result; const SearchResult& new_result = *new_results[i].result;
IdToResultMap::const_iterator ui_result_it = IdToResultMap::const_iterator ui_result_it =
ui_results_map.find(new_result->id()); ui_results_map.find(new_result.id());
if (ui_result_it != ui_results_map.end()) { if (ui_result_it != ui_results_map.end()) {
// Update and use the old result if it exists. // Update and use the old result if it exists.
SearchResult* ui_result = ui_result_it->second; SearchResult* ui_result = ui_result_it->second;
UpdateResult(*new_result, ui_result); UpdateResult(new_result, ui_result);
// |ui_results| takes back ownership from |ui_results_map| here. // |ui_results| takes back ownership from |ui_results_map| here.
ui_results->Add(ui_result); ui_results->Add(ui_result);
...@@ -223,7 +223,7 @@ void Mixer::Publish(const SortedResults& new_results, ...@@ -223,7 +223,7 @@ void Mixer::Publish(const SortedResults& new_results,
ui_results_map.erase(ui_result->id()); ui_results_map.erase(ui_result->id());
} else { } else {
// Copy the result from |new_results| otherwise. // Copy the result from |new_results| otherwise.
ui_results->Add(new_result->Duplicate().release()); ui_results->Add(new_result.Duplicate().release());
} }
} }
......
...@@ -34,7 +34,7 @@ class TestSearchResult : public SearchResult { ...@@ -34,7 +34,7 @@ class TestSearchResult : public SearchResult {
// SearchResult overrides: // SearchResult overrides:
void Open(int event_flags) override {} void Open(int event_flags) override {}
void InvokeAction(int action_index, int event_flags) override {} void InvokeAction(int action_index, int event_flags) override {}
scoped_ptr<SearchResult> Duplicate() override { scoped_ptr<SearchResult> Duplicate() const override {
return scoped_ptr<SearchResult>(new TestSearchResult(id(), relevance())); return scoped_ptr<SearchResult>(new TestSearchResult(id(), relevance()));
} }
......
...@@ -131,7 +131,7 @@ class APP_LIST_EXPORT SearchResult { ...@@ -131,7 +131,7 @@ class APP_LIST_EXPORT SearchResult {
// TODO(mukai): Remove this method and really simplify the ownership of // TODO(mukai): Remove this method and really simplify the ownership of
// SearchResult. Ideally, SearchResult will be copyable. // SearchResult. Ideally, SearchResult will be copyable.
virtual scoped_ptr<SearchResult> Duplicate() = 0; virtual scoped_ptr<SearchResult> Duplicate() const = 0;
// Opens the result. // Opens the result.
virtual void Open(int event_flags); virtual void Open(int event_flags);
......
...@@ -16,7 +16,7 @@ void TestSearchResult::SetDisplayType(SearchResult::DisplayType type) { ...@@ -16,7 +16,7 @@ void TestSearchResult::SetDisplayType(SearchResult::DisplayType type) {
set_display_type(type); set_display_type(type);
} }
scoped_ptr<SearchResult> TestSearchResult::Duplicate() { scoped_ptr<SearchResult> TestSearchResult::Duplicate() const {
NOTREACHED(); NOTREACHED();
return nullptr; return nullptr;
} }
......
...@@ -16,7 +16,7 @@ class TestSearchResult : public SearchResult { ...@@ -16,7 +16,7 @@ class TestSearchResult : public SearchResult {
~TestSearchResult() override; ~TestSearchResult() override;
// SearchResult: // SearchResult:
scoped_ptr<SearchResult> Duplicate() override; scoped_ptr<SearchResult> Duplicate() const override;
void SetDisplayType(SearchResult::DisplayType type); void SetDisplayType(SearchResult::DisplayType type);
......
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