| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_VIEWS_APP_LIST_VIEW_H_ | 5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ |
| 6 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ | 6 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "base/callback.h" | 10 #include "base/callback.h" |
| 9 #include "base/macros.h" | 11 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | |
| 11 #include "base/observer_list.h" | 12 #include "base/observer_list.h" |
| 12 #include "build/build_config.h" | 13 #include "build/build_config.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_view_delegate_observer.h" | 15 #include "ui/app_list/app_list_view_delegate_observer.h" |
| 15 #include "ui/app_list/speech_ui_model_observer.h" | 16 #include "ui/app_list/speech_ui_model_observer.h" |
| 16 #include "ui/views/bubble/bubble_delegate.h" | 17 #include "ui/views/bubble/bubble_delegate.h" |
| 17 #include "ui/views/widget/widget.h" | 18 #include "ui/views/widget/widget.h" |
| 18 | 19 |
| 19 namespace base { | 20 namespace base { |
| 20 class FilePath; | 21 class FilePath; |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 | 178 |
| 178 views::View* search_box_focus_host_; // Owned by the views hierarchy. | 179 views::View* search_box_focus_host_; // Owned by the views hierarchy. |
| 179 views::Widget* search_box_widget_; // Owned by the app list's widget. | 180 views::Widget* search_box_widget_; // Owned by the app list's widget. |
| 180 SearchBoxView* search_box_view_; // Owned by |search_box_widget_|. | 181 SearchBoxView* search_box_view_; // Owned by |search_box_widget_|. |
| 181 | 182 |
| 182 // A semi-transparent white overlay that covers the app list while dialogs are | 183 // A semi-transparent white overlay that covers the app list while dialogs are |
| 183 // open. | 184 // open. |
| 184 views::View* overlay_view_; | 185 views::View* overlay_view_; |
| 185 | 186 |
| 186 base::ObserverList<AppListViewObserver> observers_; | 187 base::ObserverList<AppListViewObserver> observers_; |
| 187 scoped_ptr<HideViewAnimationObserver> animation_observer_; | 188 std::unique_ptr<HideViewAnimationObserver> animation_observer_; |
| 188 | 189 |
| 189 // For UMA and testing. If non-null, triggered when the app list is painted. | 190 // For UMA and testing. If non-null, triggered when the app list is painted. |
| 190 base::Closure next_paint_callback_; | 191 base::Closure next_paint_callback_; |
| 191 | 192 |
| 192 DISALLOW_COPY_AND_ASSIGN(AppListView); | 193 DISALLOW_COPY_AND_ASSIGN(AppListView); |
| 193 }; | 194 }; |
| 194 | 195 |
| 195 } // namespace app_list | 196 } // namespace app_list |
| 196 | 197 |
| 197 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ | 198 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ |
| OLD | NEW |