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

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

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months 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_controller.h ('k') | ui/app_list/search_provider.h » ('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 <memory>
8 #include <utility> 9 #include <utility>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/bind.h" 12 #include "base/bind.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/metrics/user_metrics.h" 14 #include "base/metrics/user_metrics.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "ui/app_list/app_list_constants.h" 17 #include "ui/app_list/app_list_constants.h"
18 #include "ui/app_list/search/history.h" 18 #include "ui/app_list/search/history.h"
19 #include "ui/app_list/search_box_model.h" 19 #include "ui/app_list/search_box_model.h"
20 #include "ui/app_list/search_provider.h" 20 #include "ui/app_list/search_provider.h"
21 #include "ui/app_list/search_result.h" 21 #include "ui/app_list/search_result.h"
22 22
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 return mixer_->AddGroup(max_results, boost, multiplier); 118 return mixer_->AddGroup(max_results, boost, multiplier);
119 } 119 }
120 120
121 size_t SearchController::AddOmniboxGroup(size_t max_results, 121 size_t SearchController::AddOmniboxGroup(size_t max_results,
122 double boost, 122 double boost,
123 double multiplier) { 123 double multiplier) {
124 return mixer_->AddOmniboxGroup(max_results, boost, multiplier); 124 return mixer_->AddOmniboxGroup(max_results, boost, multiplier);
125 } 125 }
126 126
127 void SearchController::AddProvider(size_t group_id, 127 void SearchController::AddProvider(size_t group_id,
128 scoped_ptr<SearchProvider> provider) { 128 std::unique_ptr<SearchProvider> provider) {
129 provider->set_result_changed_callback(base::Bind( 129 provider->set_result_changed_callback(base::Bind(
130 &SearchController::OnResultsChanged, 130 &SearchController::OnResultsChanged,
131 base::Unretained(this))); 131 base::Unretained(this)));
132 mixer_->AddProviderToGroup(group_id, provider.get()); 132 mixer_->AddProviderToGroup(group_id, provider.get());
133 providers_.push_back(std::move(provider)); 133 providers_.push_back(std::move(provider));
134 } 134 }
135 135
136 void SearchController::OnResultsChanged() { 136 void SearchController::OnResultsChanged() {
137 if (dispatching_query_) 137 if (dispatching_query_)
138 return; 138 return;
139 139
140 KnownResults known_results; 140 KnownResults known_results;
141 if (history_ && history_->IsReady()) { 141 if (history_ && history_->IsReady()) {
142 history_->GetKnownResults(base::UTF16ToUTF8(search_box_->text())) 142 history_->GetKnownResults(base::UTF16ToUTF8(search_box_->text()))
143 ->swap(known_results); 143 ->swap(known_results);
144 } 144 }
145 145
146 mixer_->MixAndPublish(is_voice_query_, known_results); 146 mixer_->MixAndPublish(is_voice_query_, known_results);
147 } 147 }
148 148
149 } // namespace app_list 149 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/search_controller.h ('k') | ui/app_list/search_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698