| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_MUS_BRIDGE_WM_SHELF_MUS_H_ | 5 #ifndef ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ |
| 6 #define ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ | 6 #define ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | |
| 9 | |
| 10 #include <vector> | |
| 11 | |
| 12 #include "ash/common/shelf/wm_shelf.h" | 8 #include "ash/common/shelf/wm_shelf.h" |
| 13 #include "base/macros.h" | 9 #include "base/macros.h" |
| 14 #include "base/observer_list.h" | 10 #include "base/observer_list.h" |
| 15 | 11 |
| 12 namespace views { |
| 13 class Widget; |
| 14 } |
| 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 class WmRootWindowController; |
| 18 |
| 17 namespace mus { | 19 namespace mus { |
| 18 | 20 |
| 19 class ShelfLayoutManager; | |
| 20 | |
| 21 // WmShelf implementation for mus. | 21 // WmShelf implementation for mus. |
| 22 class WmShelfMus : public WmShelf { | 22 class WmShelfMus : public WmShelf { |
| 23 public: | 23 public: |
| 24 explicit WmShelfMus(ShelfLayoutManager* shelf_layout_manager); | 24 WmShelfMus(WmRootWindowController* root_window_controller); |
| 25 ~WmShelfMus() override; | 25 ~WmShelfMus() override; |
| 26 | 26 |
| 27 // WmShelf: | 27 // WmShelf: |
| 28 WmWindow* GetWindow() override; | 28 WmWindow* GetWindow() override; |
| 29 ShelfAlignment GetAlignment() const override; | 29 ShelfAlignment GetAlignment() const override; |
| 30 void SetAlignment(ShelfAlignment alignment) override; | 30 void SetAlignment(ShelfAlignment alignment) override; |
| 31 ShelfAutoHideBehavior GetAutoHideBehavior() const override; | 31 ShelfAutoHideBehavior GetAutoHideBehavior() const override; |
| 32 void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) override; | 32 void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) override; |
| 33 ShelfAutoHideState GetAutoHideState() const override; | 33 ShelfAutoHideState GetAutoHideState() const override; |
| 34 void UpdateAutoHideState() override; | 34 void UpdateAutoHideState() override; |
| (...skipping 11 matching lines...) Expand all Loading... |
| 46 bool ProcessGestureEvent(const ui::GestureEvent& event) override; | 46 bool ProcessGestureEvent(const ui::GestureEvent& event) override; |
| 47 void AddObserver(WmShelfObserver* observer) override; | 47 void AddObserver(WmShelfObserver* observer) override; |
| 48 void RemoveObserver(WmShelfObserver* observer) override; | 48 void RemoveObserver(WmShelfObserver* observer) override; |
| 49 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override; | 49 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override; |
| 50 ShelfLockingManager* GetShelfLockingManagerForTesting() override; | 50 ShelfLockingManager* GetShelfLockingManagerForTesting() override; |
| 51 ShelfView* GetShelfViewForTesting() override; | 51 ShelfView* GetShelfViewForTesting() override; |
| 52 | 52 |
| 53 private: | 53 private: |
| 54 base::ObserverList<WmShelfObserver> observers_; | 54 base::ObserverList<WmShelfObserver> observers_; |
| 55 | 55 |
| 56 ShelfLayoutManager* shelf_layout_manager_; | 56 // Owned by native widget. |
| 57 views::Widget* shelf_widget_; |
| 57 | 58 |
| 58 DISALLOW_COPY_AND_ASSIGN(WmShelfMus); | 59 DISALLOW_COPY_AND_ASSIGN(WmShelfMus); |
| 59 }; | 60 }; |
| 60 | 61 |
| 61 } // namespace mus | 62 } // namespace mus |
| 62 } // namespace ash | 63 } // namespace ash |
| 63 | 64 |
| 64 #endif // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ | 65 #endif // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ |
| OLD | NEW |