Chromium Code Reviews| 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/shelf/shelf_background_animator.h" | |
| 12 #include "ash/common/shelf/shelf_background_animator_observer.h" | |
|
James Cook
2016/06/14 17:50:02
Do you need this include?
bruthig
2016/07/26 19:50:03
Removed.
| |
| 11 #include "ash/common/shelf/shelf_types.h" | 13 #include "ash/common/shelf/shelf_types.h" |
| 12 #include "ash/common/wm/background_animator.h" | |
| 13 #include "ash/shelf/shelf_layout_manager_observer.h" | 14 #include "ash/shelf/shelf_layout_manager_observer.h" |
| 14 #include "base/macros.h" | 15 #include "base/macros.h" |
| 15 #include "ui/views/widget/widget.h" | 16 #include "ui/views/widget/widget.h" |
| 16 #include "ui/views/widget/widget_observer.h" | 17 #include "ui/views/widget/widget_observer.h" |
| 17 | 18 |
| 18 namespace ash { | 19 namespace ash { |
| 19 class FocusCycler; | 20 class FocusCycler; |
| 20 class Shelf; | 21 class Shelf; |
| 21 class ShelfLayoutManager; | 22 class ShelfLayoutManager; |
| 22 class StatusAreaWidget; | 23 class StatusAreaWidget; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 104 void OnGestureEvent(ui::GestureEvent* event) override; | 105 void OnGestureEvent(ui::GestureEvent* event) override; |
| 105 | 106 |
| 106 // Owned by the shelf container's aura::Window. | 107 // Owned by the shelf container's aura::Window. |
| 107 ShelfLayoutManager* shelf_layout_manager_; | 108 ShelfLayoutManager* shelf_layout_manager_; |
| 108 std::unique_ptr<Shelf> shelf_; | 109 std::unique_ptr<Shelf> shelf_; |
| 109 StatusAreaWidget* status_area_widget_; | 110 StatusAreaWidget* status_area_widget_; |
| 110 | 111 |
| 111 // |delegate_view_| is the contents view of this widget and is cleaned up | 112 // |delegate_view_| is the contents view of this widget and is cleaned up |
| 112 // during CloseChildWindows of the associated RootWindowController. | 113 // during CloseChildWindows of the associated RootWindowController. |
| 113 DelegateView* delegate_view_; | 114 DelegateView* delegate_view_; |
| 114 BackgroundAnimator background_animator_; | 115 ShelfBackgroundAnimator background_animator_; |
| 115 bool activating_as_fallback_; | 116 bool activating_as_fallback_; |
| 116 | 117 |
| 117 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); | 118 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); |
| 118 }; | 119 }; |
| 119 | 120 |
| 120 } // namespace ash | 121 } // namespace ash |
| 121 | 122 |
| 122 #endif // ASH_SHELF_SHELF_WIDGET_H_ | 123 #endif // ASH_SHELF_SHELF_WIDGET_H_ |
| OLD | NEW |