Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Side by Side Diff: ui/app_list/search_controller.cc

Issue 1539583003: Convert Pass()→std::move() in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/app_list/search_box_model.cc ('k') | ui/app_list/search_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/app_list/search_controller.h" 5 #include "ui/app_list/search_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/bind.h" 11 #include "base/bind.h"
11 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
12 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
13 #include "base/metrics/user_metrics.h" 14 #include "base/metrics/user_metrics.h"
14 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
16 #include "ui/app_list/app_list_constants.h" 17 #include "ui/app_list/app_list_constants.h"
17 #include "ui/app_list/search/history.h" 18 #include "ui/app_list/search/history.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 double multiplier) { 123 double multiplier) {
123 return mixer_->AddOmniboxGroup(max_results, boost, multiplier); 124 return mixer_->AddOmniboxGroup(max_results, boost, multiplier);
124 } 125 }
125 126
126 void SearchController::AddProvider(size_t group_id, 127 void SearchController::AddProvider(size_t group_id,
127 scoped_ptr<SearchProvider> provider) { 128 scoped_ptr<SearchProvider> provider) {
128 provider->set_result_changed_callback(base::Bind( 129 provider->set_result_changed_callback(base::Bind(
129 &SearchController::OnResultsChanged, 130 &SearchController::OnResultsChanged,
130 base::Unretained(this))); 131 base::Unretained(this)));
131 mixer_->AddProviderToGroup(group_id, provider.get()); 132 mixer_->AddProviderToGroup(group_id, provider.get());
132 providers_.push_back(provider.Pass()); 133 providers_.push_back(std::move(provider));
133 } 134 }
134 135
135 void SearchController::OnResultsChanged() { 136 void SearchController::OnResultsChanged() {
136 if (dispatching_query_) 137 if (dispatching_query_)
137 return; 138 return;
138 139
139 KnownResults known_results; 140 KnownResults known_results;
140 if (history_ && history_->IsReady()) { 141 if (history_ && history_->IsReady()) {
141 history_->GetKnownResults(base::UTF16ToUTF8(search_box_->text())) 142 history_->GetKnownResults(base::UTF16ToUTF8(search_box_->text()))
142 ->swap(known_results); 143 ->swap(known_results);
143 } 144 }
144 145
145 mixer_->MixAndPublish(is_voice_query_, known_results); 146 mixer_->MixAndPublish(is_voice_query_, known_results);
146 } 147 }
147 148
148 } // namespace app_list 149 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/search_box_model.cc ('k') | ui/app_list/search_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698