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

Side by Side Diff: components/search_engines/template_url_service.cc

Issue 2816383002: Remove non-const version of GetDefaultSearchProvider() and make all callers call the const version (Closed)
Patch Set: Fix unit test (the model was already loaded) Created 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/search_engines/template_url_service.h" 5 #include "components/search_engines/template_url_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 } else { 607 } else {
608 // We rely on the DefaultSearchManager to call OnDefaultSearchChange if, in 608 // We rely on the DefaultSearchManager to call OnDefaultSearchChange if, in
609 // fact, the effective DSE changes. 609 // fact, the effective DSE changes.
610 if (url) 610 if (url)
611 default_search_manager_.SetUserSelectedDefaultSearchEngine(url->data()); 611 default_search_manager_.SetUserSelectedDefaultSearchEngine(url->data());
612 else 612 else
613 default_search_manager_.ClearUserSelectedDefaultSearchEngine(); 613 default_search_manager_.ClearUserSelectedDefaultSearchEngine();
614 } 614 }
615 } 615 }
616 616
617 TemplateURL* TemplateURLService::GetDefaultSearchProvider() {
618 return const_cast<TemplateURL*>(
619 static_cast<const TemplateURLService*>(this)->GetDefaultSearchProvider());
620 }
621
622 const TemplateURL* TemplateURLService::GetDefaultSearchProvider() const { 617 const TemplateURL* TemplateURLService::GetDefaultSearchProvider() const {
623 return loaded_ ? default_search_provider_ 618 return loaded_ ? default_search_provider_
624 : initial_default_search_provider_.get(); 619 : initial_default_search_provider_.get();
625 } 620 }
626 621
627 bool TemplateURLService::IsSearchResultsPageFromDefaultSearchProvider( 622 bool TemplateURLService::IsSearchResultsPageFromDefaultSearchProvider(
628 const GURL& url) const { 623 const GURL& url) const {
629 const TemplateURL* default_provider = GetDefaultSearchProvider(); 624 const TemplateURL* default_provider = GetDefaultSearchProvider();
630 return default_provider && 625 return default_provider &&
631 default_provider->IsSearchURL(url, search_terms_data()); 626 default_provider->IsSearchURL(url, search_terms_data());
(...skipping 1856 matching lines...) Expand 10 before | Expand all | Expand 10 after
2488 if (!IsCreatedByExtension(template_url.get())) { 2483 if (!IsCreatedByExtension(template_url.get())) {
2489 if (keyword_to_template_url.find(template_url->keyword()) != 2484 if (keyword_to_template_url.find(template_url->keyword()) !=
2490 keyword_to_template_url.end()) { 2485 keyword_to_template_url.end()) {
2491 return true; 2486 return true;
2492 } 2487 }
2493 keyword_to_template_url[template_url->keyword()] = template_url.get(); 2488 keyword_to_template_url[template_url->keyword()] = template_url.get();
2494 } 2489 }
2495 } 2490 }
2496 return false; 2491 return false;
2497 } 2492 }
OLDNEW
« no previous file with comments | « components/search_engines/template_url_service.h ('k') | ios/chrome/browser/google/google_logo_service.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698