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

Side by Side Diff: athena/extensions/shell/shell_search_controller_factory.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 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 "athena/extensions/shell/shell_search_controller_factory.h" 5 #include "athena/extensions/shell/shell_search_controller_factory.h"
6 6
7 #include "athena/extensions/shell/url_search_provider.h" 7 #include "athena/extensions/shell/url_search_provider.h"
8 #include "ui/app_list/search_controller.h" 8 #include "ui/app_list/search_controller.h"
9 9
10 namespace athena { 10 namespace athena {
11 11
12 ShellSearchControllerFactory::ShellSearchControllerFactory( 12 ShellSearchControllerFactory::ShellSearchControllerFactory(
13 content::BrowserContext* browser_context) 13 content::BrowserContext* browser_context)
14 : browser_context_(browser_context) { 14 : browser_context_(browser_context) {
15 } 15 }
16 16
17 ShellSearchControllerFactory::~ShellSearchControllerFactory() { 17 ShellSearchControllerFactory::~ShellSearchControllerFactory() {
18 } 18 }
19 19
20 scoped_ptr<app_list::SearchController> ShellSearchControllerFactory::Create( 20 scoped_ptr<app_list::SearchController> ShellSearchControllerFactory::Create(
21 app_list::SearchBoxModel* search_box, 21 app_list::SearchBoxModel* search_box,
22 app_list::AppListModel::SearchResults* results) { 22 app_list::AppListModel::SearchResults* results) {
23 scoped_ptr<app_list::SearchController> controller( 23 scoped_ptr<app_list::SearchController> controller(
24 new app_list::SearchController( 24 new app_list::SearchController(
25 search_box, results, NULL /* no history */)); 25 search_box, results, nullptr /* no history */));
26 controller->AddProvider(app_list::Mixer::MAIN_GROUP, 26 controller->AddProvider(app_list::Mixer::MAIN_GROUP,
27 scoped_ptr<app_list::SearchProvider>( 27 scoped_ptr<app_list::SearchProvider>(
28 new UrlSearchProvider(browser_context_))); 28 new UrlSearchProvider(browser_context_)));
29 return controller.Pass(); 29 return controller.Pass();
30 } 30 }
31 31
32 scoped_ptr<SearchControllerFactory> CreateSearchControllerFactory( 32 scoped_ptr<SearchControllerFactory> CreateSearchControllerFactory(
33 content::BrowserContext* context) { 33 content::BrowserContext* context) {
34 return make_scoped_ptr(new ShellSearchControllerFactory(context)); 34 return make_scoped_ptr(new ShellSearchControllerFactory(context));
35 } 35 }
36 36
37 } // namespace athena 37 } // namespace athena
OLDNEW
« no previous file with comments | « athena/extensions/shell/extensions_delegate_impl.cc ('k') | athena/extensions/shell/url_search_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698