| 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 ASH_SHELF_SHELF_WIDGET_H_ | 5 #ifndef ASH_SHELF_SHELF_WIDGET_H_ |
| 6 #define ASH_SHELF_SHELF_WIDGET_H_ | 6 #define ASH_SHELF_SHELF_WIDGET_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "ash/common/wm/background_animator.h" |
| 11 #include "ash/shelf/shelf_layout_manager_observer.h" | 12 #include "ash/shelf/shelf_layout_manager_observer.h" |
| 12 #include "ash/shelf/shelf_types.h" | 13 #include "ash/shelf/shelf_types.h" |
| 13 #include "ash/wm/common/background_animator.h" | |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "ui/views/widget/widget.h" | 15 #include "ui/views/widget/widget.h" |
| 16 #include "ui/views/widget/widget_observer.h" | 16 #include "ui/views/widget/widget_observer.h" |
| 17 | 17 |
| 18 namespace ash { | 18 namespace ash { |
| 19 class FocusCycler; | 19 class FocusCycler; |
| 20 class Shelf; | 20 class Shelf; |
| 21 class ShelfLayoutManager; | 21 class ShelfLayoutManager; |
| 22 class StatusAreaWidget; | 22 class StatusAreaWidget; |
| 23 class WorkspaceController; | 23 class WorkspaceController; |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 DelegateView* delegate_view_; | 114 DelegateView* delegate_view_; |
| 115 BackgroundAnimator background_animator_; | 115 BackgroundAnimator background_animator_; |
| 116 bool activating_as_fallback_; | 116 bool activating_as_fallback_; |
| 117 | 117 |
| 118 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); | 118 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); |
| 119 }; | 119 }; |
| 120 | 120 |
| 121 } // namespace ash | 121 } // namespace ash |
| 122 | 122 |
| 123 #endif // ASH_SHELF_SHELF_WIDGET_H_ | 123 #endif // ASH_SHELF_SHELF_WIDGET_H_ |
| OLD | NEW |