| 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_TEST_SHELF_VIEW_TEST_API_H_ | 5 #ifndef ASH_TEST_SHELF_VIEW_TEST_API_H_ |
| 6 #define ASH_TEST_SHELF_VIEW_TEST_API_H_ | 6 #define ASH_TEST_SHELF_VIEW_TEST_API_H_ |
| 7 | 7 |
| 8 #include "ash/shelf/shelf_item_delegate.h" | 8 #include "ash/common/shelf/shelf_item_delegate.h" |
| 9 #include "ash/shelf/shelf_item_types.h" | 9 #include "ash/common/shelf/shelf_item_types.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 | 11 |
| 12 namespace gfx { | 12 namespace gfx { |
| 13 class Rect; | 13 class Rect; |
| 14 class Size; | 14 class Size; |
| 15 } | 15 } |
| 16 | 16 |
| 17 namespace ui { | 17 namespace ui { |
| 18 class Event; | 18 class Event; |
| 19 } | 19 } |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 private: | 108 private: |
| 109 ShelfView* shelf_view_; | 109 ShelfView* shelf_view_; |
| 110 | 110 |
| 111 DISALLOW_COPY_AND_ASSIGN(ShelfViewTestAPI); | 111 DISALLOW_COPY_AND_ASSIGN(ShelfViewTestAPI); |
| 112 }; | 112 }; |
| 113 | 113 |
| 114 } // namespace test | 114 } // namespace test |
| 115 } // namespace ash | 115 } // namespace ash |
| 116 | 116 |
| 117 #endif // ASH_TEST_SHELF_VIEW_TEST_API_H_ | 117 #endif // ASH_TEST_SHELF_VIEW_TEST_API_H_ |
| OLD | NEW |