| 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/shelf/background_animator.h" | |
| 12 #include "ash/shelf/shelf_layout_manager_observer.h" | 11 #include "ash/shelf/shelf_layout_manager_observer.h" |
| 13 #include "ash/shelf/shelf_types.h" | 12 #include "ash/shelf/shelf_types.h" |
| 13 #include "ash/wm/common/background_animator.h" |
| 14 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
| 15 #include "ui/views/widget/widget_observer.h" | 15 #include "ui/views/widget/widget_observer.h" |
| 16 | 16 |
| 17 namespace aura { | 17 namespace aura { |
| 18 class Window; | 18 class Window; |
| 19 } | 19 } |
| 20 | 20 |
| 21 namespace ash { | 21 namespace ash { |
| 22 class FocusCycler; | 22 class FocusCycler; |
| 23 class Shelf; | 23 class Shelf; |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 // during CloseChildWindows of the associated RootWindowController. | 109 // during CloseChildWindows of the associated RootWindowController. |
| 110 DelegateView* delegate_view_; | 110 DelegateView* delegate_view_; |
| 111 BackgroundAnimator background_animator_; | 111 BackgroundAnimator background_animator_; |
| 112 bool activating_as_fallback_; | 112 bool activating_as_fallback_; |
| 113 aura::Window* window_container_; | 113 aura::Window* window_container_; |
| 114 }; | 114 }; |
| 115 | 115 |
| 116 } // namespace ash | 116 } // namespace ash |
| 117 | 117 |
| 118 #endif // ASH_SHELF_SHELF_WIDGET_H_ | 118 #endif // ASH_SHELF_SHELF_WIDGET_H_ |
| OLD | NEW |