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

Side by Side Diff: athena/extensions/chrome/chrome_search_controller_factory.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase 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 #ifndef ATHENA_EXTENSIONS_CHROME_CHROME_SEARCH_CONTROLLER_FACTORY_H_ 5 #ifndef ATHENA_EXTENSIONS_CHROME_CHROME_SEARCH_CONTROLLER_FACTORY_H_
6 #define ATHENA_EXTENSIONS_CHROME_CHROME_SEARCH_CONTROLLER_FACTORY_H_ 6 #define ATHENA_EXTENSIONS_CHROME_CHROME_SEARCH_CONTROLLER_FACTORY_H_
7 7
8 #include "athena/home/public/search_controller_factory.h" 8 #include "athena/home/public/search_controller_factory.h"
9 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" 9 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
10 10
11 namespace content { 11 namespace content {
12 class BrowserContext; 12 class BrowserContext;
13 } 13 }
14 14
15 namespace athena { 15 namespace athena {
16 16
17 class ChromeSearchControllerFactory : public SearchControllerFactory { 17 class ChromeSearchControllerFactory : public SearchControllerFactory {
18 public: 18 public:
19 explicit ChromeSearchControllerFactory( 19 explicit ChromeSearchControllerFactory(
20 content::BrowserContext* browser_context); 20 content::BrowserContext* browser_context);
21 virtual ~ChromeSearchControllerFactory(); 21 ~ChromeSearchControllerFactory() override;
22 22
23 virtual scoped_ptr<app_list::SearchController> Create( 23 scoped_ptr<app_list::SearchController> Create(
24 app_list::SearchBoxModel* search_box, 24 app_list::SearchBoxModel* search_box,
25 app_list::AppListModel::SearchResults* results) override; 25 app_list::AppListModel::SearchResults* results) override;
26 26
27 private: 27 private:
28 content::BrowserContext* browser_context_; 28 content::BrowserContext* browser_context_;
29 scoped_ptr<AppListControllerDelegate> list_controller_; 29 scoped_ptr<AppListControllerDelegate> list_controller_;
30 30
31 DISALLOW_COPY_AND_ASSIGN(ChromeSearchControllerFactory); 31 DISALLOW_COPY_AND_ASSIGN(ChromeSearchControllerFactory);
32 }; 32 };
33 33
34 } // namespace athena 34 } // namespace athena
35 35
36 #endif // ATHENA_EXTENSIONS_CHROME_CHROME_SEARCH_CONTROLLER_FACTORY_H_ 36 #endif // ATHENA_EXTENSIONS_CHROME_CHROME_SEARCH_CONTROLLER_FACTORY_H_
OLDNEW
« no previous file with comments | « athena/extensions/chrome/athena_extension_install_ui.cc ('k') | athena/extensions/chrome/extensions_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698