| 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 MASH_WM_BRIDGE_WM_SHELF_MUS_H_ | 5 #ifndef MASH_WM_BRIDGE_WM_SHELF_MUS_H_ |
| 6 #define MASH_WM_BRIDGE_WM_SHELF_MUS_H_ | 6 #define MASH_WM_BRIDGE_WM_SHELF_MUS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "ash/wm/common/shelf/wm_shelf.h" | 12 #include "ash/common/wm/shelf/wm_shelf.h" |
| 13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "base/observer_list.h" | 14 #include "base/observer_list.h" |
| 15 | 15 |
| 16 namespace mash { | 16 namespace mash { |
| 17 namespace wm { | 17 namespace wm { |
| 18 | 18 |
| 19 class ShelfLayoutManager; | 19 class ShelfLayoutManager; |
| 20 | 20 |
| 21 // WmShelf implementation for mus. | 21 // WmShelf implementation for mus. |
| 22 class WmShelfMus : public ash::wm::WmShelf { | 22 class WmShelfMus : public ash::wm::WmShelf { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 41 | 41 |
| 42 ShelfLayoutManager* shelf_layout_manager_; | 42 ShelfLayoutManager* shelf_layout_manager_; |
| 43 | 43 |
| 44 DISALLOW_COPY_AND_ASSIGN(WmShelfMus); | 44 DISALLOW_COPY_AND_ASSIGN(WmShelfMus); |
| 45 }; | 45 }; |
| 46 | 46 |
| 47 } // namespace wm | 47 } // namespace wm |
| 48 } // namespace mash | 48 } // namespace mash |
| 49 | 49 |
| 50 #endif // MASH_WM_BRIDGE_WM_SHELF_MUS_H_ | 50 #endif // MASH_WM_BRIDGE_WM_SHELF_MUS_H_ |
| OLD | NEW |