| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_COMMON_TEST_TEST_SHELF_DELEGATE_H_ | 5 #ifndef ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_ |
| 6 #define ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_ | 6 #define ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> |
| 9 #include <set> | 10 #include <set> |
| 10 #include <string> | 11 #include <string> |
| 11 | 12 |
| 12 #include "ash/common/shelf/shelf_delegate.h" | 13 #include "ash/common/shelf/shelf_delegate.h" |
| 13 #include "base/macros.h" | 14 #include "base/macros.h" |
| 14 #include "ui/aura/window_observer.h" | 15 #include "ui/aura/window_observer.h" |
| 15 | 16 |
| 16 namespace ash { | 17 namespace ash { |
| 17 | 18 |
| 18 class WmWindow; | 19 class WmWindow; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 // Tracks the ShelfID to app id mappings. | 78 // Tracks the ShelfID to app id mappings. |
| 78 std::map<ShelfID, std::string> shelf_id_to_app_id_map_; | 79 std::map<ShelfID, std::string> shelf_id_to_app_id_map_; |
| 79 | 80 |
| 80 DISALLOW_COPY_AND_ASSIGN(TestShelfDelegate); | 81 DISALLOW_COPY_AND_ASSIGN(TestShelfDelegate); |
| 81 }; | 82 }; |
| 82 | 83 |
| 83 } // namespace test | 84 } // namespace test |
| 84 } // namespace ash | 85 } // namespace ash |
| 85 | 86 |
| 86 #endif // ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_ | 87 #endif // ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2750463009:
mash: Fix ShelfItem mojo struct; add enums and traits. (Closed)
