OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 CHROME_BROWSER_UI_APP_LIST_SEARCH_OMNIBOX_PROVIDER_H_ | 5 #ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_OMNIBOX_PROVIDER_H_ |
6 #define CHROME_BROWSER_UI_APP_LIST_SEARCH_OMNIBOX_PROVIDER_H_ | 6 #define CHROME_BROWSER_UI_APP_LIST_SEARCH_OMNIBOX_PROVIDER_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "components/omnibox/browser/autocomplete_controller_delegate.h" | 11 #include "components/omnibox/browser/autocomplete_controller_delegate.h" |
11 #include "ui/app_list/search_provider.h" | 12 #include "ui/app_list/search_provider.h" |
12 | 13 |
13 class AppListControllerDelegate; | 14 class AppListControllerDelegate; |
14 class AutocompleteController; | 15 class AutocompleteController; |
15 class AutocompleteResult; | 16 class AutocompleteResult; |
16 class Profile; | 17 class Profile; |
17 | 18 |
18 namespace app_list { | 19 namespace app_list { |
19 | 20 |
(...skipping 14 matching lines...) Expand all Loading... |
34 void PopulateFromACResult(const AutocompleteResult& result); | 35 void PopulateFromACResult(const AutocompleteResult& result); |
35 | 36 |
36 // AutocompleteControllerDelegate overrides: | 37 // AutocompleteControllerDelegate overrides: |
37 void OnResultChanged(bool default_match_changed) override; | 38 void OnResultChanged(bool default_match_changed) override; |
38 | 39 |
39 Profile* profile_; | 40 Profile* profile_; |
40 AppListControllerDelegate* list_controller_; | 41 AppListControllerDelegate* list_controller_; |
41 | 42 |
42 // The omnibox AutocompleteController that collects/sorts/dup- | 43 // The omnibox AutocompleteController that collects/sorts/dup- |
43 // eliminates the results as they come in. | 44 // eliminates the results as they come in. |
44 scoped_ptr<AutocompleteController> controller_; | 45 std::unique_ptr<AutocompleteController> controller_; |
45 | 46 |
46 // Whether the current query is a voice query. | 47 // Whether the current query is a voice query. |
47 bool is_voice_query_; | 48 bool is_voice_query_; |
48 | 49 |
49 DISALLOW_COPY_AND_ASSIGN(OmniboxProvider); | 50 DISALLOW_COPY_AND_ASSIGN(OmniboxProvider); |
50 }; | 51 }; |
51 | 52 |
52 } // namespace app_list | 53 } // namespace app_list |
53 | 54 |
54 #endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_OMNIBOX_PROVIDER_H_ | 55 #endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_OMNIBOX_PROVIDER_H_ |
OLD | NEW |