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

Side by Side Diff: components/omnibox/browser/autocomplete_controller.cc

Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad headers Created 4 years, 11 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "components/omnibox/browser/autocomplete_controller.h" 5 #include "components/omnibox/browser/autocomplete_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8
9 #include <set> 8 #include <set>
10 #include <string> 9 #include <string>
10 #include <utility>
11 11
12 #include "base/format_macros.h" 12 #include "base/format_macros.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 #include "components/omnibox/browser/autocomplete_controller_delegate.h" 19 #include "components/omnibox/browser/autocomplete_controller_delegate.h"
20 #include "components/omnibox/browser/bookmark_provider.h" 20 #include "components/omnibox/browser/bookmark_provider.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 match.type == AutocompleteMatchType::SEARCH_SUGGEST_PROFILE; 165 match.type == AutocompleteMatchType::SEARCH_SUGGEST_PROFILE;
166 } 166 }
167 167
168 } // namespace 168 } // namespace
169 169
170 AutocompleteController::AutocompleteController( 170 AutocompleteController::AutocompleteController(
171 scoped_ptr<AutocompleteProviderClient> provider_client, 171 scoped_ptr<AutocompleteProviderClient> provider_client,
172 AutocompleteControllerDelegate* delegate, 172 AutocompleteControllerDelegate* delegate,
173 int provider_types) 173 int provider_types)
174 : delegate_(delegate), 174 : delegate_(delegate),
175 provider_client_(provider_client.Pass()), 175 provider_client_(std::move(provider_client)),
176 history_url_provider_(NULL), 176 history_url_provider_(NULL),
177 keyword_provider_(NULL), 177 keyword_provider_(NULL),
178 search_provider_(NULL), 178 search_provider_(NULL),
179 zero_suggest_provider_(NULL), 179 zero_suggest_provider_(NULL),
180 stop_timer_duration_(OmniboxFieldTrial::StopTimerFieldTrialDuration()), 180 stop_timer_duration_(OmniboxFieldTrial::StopTimerFieldTrialDuration()),
181 done_(true), 181 done_(true),
182 in_start_(false), 182 in_start_(false),
183 template_url_service_(provider_client_->GetTemplateURLService()) { 183 template_url_service_(provider_client_->GetTemplateURLService()) {
184 provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); 184 provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
185 if (provider_types & AutocompleteProvider::TYPE_BOOKMARK) 185 if (provider_types & AutocompleteProvider::TYPE_BOOKMARK)
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 expire_timer_.Stop(); 652 expire_timer_.Stop();
653 stop_timer_.Stop(); 653 stop_timer_.Stop();
654 done_ = true; 654 done_ = true;
655 if (clear_result && !result_.empty()) { 655 if (clear_result && !result_.empty()) {
656 result_.Reset(); 656 result_.Reset();
657 // NOTE: We pass in false since we're trying to only clear the popup, not 657 // NOTE: We pass in false since we're trying to only clear the popup, not
658 // touch the edit... this is all a mess and should be cleaned up :( 658 // touch the edit... this is all a mess and should be cleaned up :(
659 NotifyChanged(false); 659 NotifyChanged(false);
660 } 660 }
661 } 661 }
OLDNEW
« no previous file with comments | « components/omnibox/browser/autocomplete_classifier.cc ('k') | components/omnibox/browser/base_search_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698