| 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_SHELF_SHELF_ALIGNMENT_MENU_H_ | 5 #ifndef ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_ |
| 6 #define ASH_SHELF_SHELF_ALIGNMENT_MENU_H_ | 6 #define ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "ui/base/models/simple_menu_model.h" | 10 #include "ui/base/models/simple_menu_model.h" |
| 11 | 11 |
| 12 namespace ash { | 12 namespace ash { |
| 13 | 13 |
| 14 class WmShelf; | 14 class WmShelf; |
| 15 | 15 |
| 16 // Submenu for choosing the alignment of the shelf. | 16 // Submenu for choosing the alignment of the shelf. |
| (...skipping 18 matching lines...) Expand all Loading... |
| 35 MENU_ALIGN_BOTTOM, | 35 MENU_ALIGN_BOTTOM, |
| 36 }; | 36 }; |
| 37 | 37 |
| 38 WmShelf* wm_shelf_; | 38 WmShelf* wm_shelf_; |
| 39 | 39 |
| 40 DISALLOW_COPY_AND_ASSIGN(ShelfAlignmentMenu); | 40 DISALLOW_COPY_AND_ASSIGN(ShelfAlignmentMenu); |
| 41 }; | 41 }; |
| 42 | 42 |
| 43 } // namespace ash | 43 } // namespace ash |
| 44 | 44 |
| 45 #endif // ASH_SHELF_SHELF_ALIGNMENT_MENU_H_ | 45 #endif // ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_ |
| OLD | NEW |