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

Unified Diff: athena/extensions/shell/url_search_provider.cc

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: athena/extensions/shell/url_search_provider.cc
diff --git a/athena/extensions/shell/url_search_provider.cc b/athena/extensions/shell/url_search_provider.cc
index b3f0f9ee71556d7233041f40430addc6add71c20..8ff3b33bf6e42baca746122a7f69e3ad0fb7adeb 100644
--- a/athena/extensions/shell/url_search_provider.cc
+++ b/athena/extensions/shell/url_search_provider.cc
@@ -91,7 +91,7 @@ class AthenaAutocompleteProviderClient : public AutocompleteProviderClient {
metrics::OmniboxEventProto::PageClassification page_classification,
AutocompleteMatch* match,
GURL* alternate_nav_url) override {}
- virtual history::URLDatabase* InMemoryDatabase() override { return NULL; }
+ virtual history::URLDatabase* InMemoryDatabase() override { return nullptr; }
virtual void DeleteMatchingURLsForKeywordFromHistory(
history::KeywordID keyword_id,
const base::string16& term) override {}
@@ -208,13 +208,13 @@ UrlSearchProvider::UrlSearchProvider(content::BrowserContext* browser_context)
: browser_context_(browser_context),
// TODO(mukai): introduce the real parameters when it's necessary.
template_url_service_(new TemplateURLService(
- NULL /* prefs */,
+ nullptr /* prefs */,
scoped_ptr<SearchTermsData>(new AthenaSearchTermsData()),
- NULL /* KeywordWebDataService */,
+ nullptr /* KeywordWebDataService */,
scoped_ptr<TemplateURLServiceClient>(
new AthenaTemplateURLServiceClient()),
- NULL /*GoogleURLTracker */,
- NULL /* RapporService */,
+ nullptr /*GoogleURLTracker */,
+ nullptr /* RapporService */,
base::Closure() /* dsp_change_callback */)),
provider_(new ::SearchProvider(
this,
@@ -248,7 +248,7 @@ void UrlSearchProvider::Start(const base::string16& query) {
if (input_.type() == metrics::OmniboxInputType::URL) {
// TODO(hashimoto): Componentize HistoryURLProvider and remove this code.
AutocompleteMatch what_you_typed_match(
- NULL, 0, false, AutocompleteMatchType::URL_WHAT_YOU_TYPED);
+ nullptr, 0, false, AutocompleteMatchType::URL_WHAT_YOU_TYPED);
what_you_typed_match.destination_url = input_.canonicalized_url();
what_you_typed_match.contents = input_.text();
what_you_typed_match.relevance = kScoreForWhatYouTypedResult;
« no previous file with comments | « athena/extensions/shell/shell_search_controller_factory.cc ('k') | athena/extensions/test/test_extensions_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698