| 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 UI_APP_LIST_SEARCH_MIXER_H_ | 5 #ifndef UI_APP_LIST_SEARCH_MIXER_H_ |
| 6 #define UI_APP_LIST_SEARCH_MIXER_H_ | 6 #define UI_APP_LIST_SEARCH_MIXER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> |
| 9 | 10 |
| 10 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 11 #include "base/gtest_prod_util.h" | 12 #include "base/gtest_prod_util.h" |
| 12 #include "base/memory/linked_ptr.h" | 13 #include "base/memory/linked_ptr.h" |
| 13 #include "ui/app_list/app_list_export.h" | 14 #include "ui/app_list/app_list_export.h" |
| 14 #include "ui/app_list/app_list_model.h" | 15 #include "ui/app_list/app_list_model.h" |
| 15 #include "ui/app_list/search/history_types.h" | 16 #include "ui/app_list/search/history_types.h" |
| 16 | 17 |
| 17 namespace app_list { | 18 namespace app_list { |
| 18 | 19 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 | 83 |
| 83 AppListModel::SearchResults* ui_results_; // Not owned. | 84 AppListModel::SearchResults* ui_results_; // Not owned. |
| 84 Groups groups_; | 85 Groups groups_; |
| 85 | 86 |
| 86 DISALLOW_COPY_AND_ASSIGN(Mixer); | 87 DISALLOW_COPY_AND_ASSIGN(Mixer); |
| 87 }; | 88 }; |
| 88 | 89 |
| 89 } // namespace app_list | 90 } // namespace app_list |
| 90 | 91 |
| 91 #endif // UI_APP_LIST_SEARCH_MIXER_H_ | 92 #endif // UI_APP_LIST_SEARCH_MIXER_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 788493002:
app_list: Enable level 1 of cpplint, be stricker. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master