| 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_SYSUI_SHELF_DELEGATE_MUS_H_ | 5 #ifndef ASH_SYSUI_SHELF_DELEGATE_MUS_H_ |
| 6 #define ASH_SYSUI_SHELF_DELEGATE_MUS_H_ | 6 #define ASH_SYSUI_SHELF_DELEGATE_MUS_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "ash/common/shelf/shelf_delegate.h" |
| 10 #include "ash/public/interfaces/shelf_layout.mojom.h" | 11 #include "ash/public/interfaces/shelf_layout.mojom.h" |
| 11 #include "ash/public/interfaces/user_window_controller.mojom.h" | 12 #include "ash/public/interfaces/user_window_controller.mojom.h" |
| 12 #include "ash/shelf/shelf_delegate.h" | |
| 13 #include "mash/shelf/public/interfaces/shelf.mojom.h" | 13 #include "mash/shelf/public/interfaces/shelf.mojom.h" |
| 14 #include "mojo/public/cpp/bindings/binding.h" | 14 #include "mojo/public/cpp/bindings/binding.h" |
| 15 #include "mojo/public/cpp/bindings/interface_ptr_set.h" | 15 #include "mojo/public/cpp/bindings/interface_ptr_set.h" |
| 16 | 16 |
| 17 namespace ash { | 17 namespace ash { |
| 18 | 18 |
| 19 class ShelfModel; | 19 class ShelfModel; |
| 20 | 20 |
| 21 namespace sysui { | 21 namespace sysui { |
| 22 | 22 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 std::map<std::string, ShelfID> app_id_to_shelf_id_; | 82 std::map<std::string, ShelfID> app_id_to_shelf_id_; |
| 83 std::map<ShelfID, std::string> shelf_id_to_app_id_; | 83 std::map<ShelfID, std::string> shelf_id_to_app_id_; |
| 84 | 84 |
| 85 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus); | 85 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus); |
| 86 }; | 86 }; |
| 87 | 87 |
| 88 } // namespace sysui | 88 } // namespace sysui |
| 89 } // namespace ash | 89 } // namespace ash |
| 90 | 90 |
| 91 #endif // ASH_SYSUI_SHELF_DELEGATE_MUS_H_ | 91 #endif // ASH_SYSUI_SHELF_DELEGATE_MUS_H_ |
| OLD | NEW |