| 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_SHELF_SHELF_TYPES_H_ | 5 #ifndef MASH_SHELF_SHELF_TYPES_H_ |
| 6 #define ASH_SHELF_SHELF_TYPES_H_ | 6 #define MASH_SHELF_SHELF_TYPES_H_ |
| 7 | 7 |
| 8 namespace ash { | 8 namespace mash { |
| 9 namespace shelf { |
| 9 | 10 |
| 10 enum ShelfAlignment { | 11 enum ShelfAlignment { |
| 11 SHELF_ALIGNMENT_BOTTOM, | 12 SHELF_ALIGNMENT_BOTTOM, |
| 12 SHELF_ALIGNMENT_LEFT, | 13 SHELF_ALIGNMENT_LEFT, |
| 13 SHELF_ALIGNMENT_RIGHT, | 14 SHELF_ALIGNMENT_RIGHT, |
| 14 SHELF_ALIGNMENT_TOP, | 15 SHELF_ALIGNMENT_TOP, |
| 15 }; | 16 }; |
| 16 | 17 |
| 17 enum ShelfAutoHideBehavior { | 18 enum ShelfAutoHideBehavior { |
| 18 // Always auto-hide. | 19 // Always auto-hide. |
| (...skipping 26 matching lines...) Expand all Loading... |
| 45 // The default transparent background. | 46 // The default transparent background. |
| 46 SHELF_BACKGROUND_DEFAULT, | 47 SHELF_BACKGROUND_DEFAULT, |
| 47 | 48 |
| 48 // The background when a window is overlapping. | 49 // The background when a window is overlapping. |
| 49 SHELF_BACKGROUND_OVERLAP, | 50 SHELF_BACKGROUND_OVERLAP, |
| 50 | 51 |
| 51 // The background when a window is maximized. | 52 // The background when a window is maximized. |
| 52 SHELF_BACKGROUND_MAXIMIZED, | 53 SHELF_BACKGROUND_MAXIMIZED, |
| 53 }; | 54 }; |
| 54 | 55 |
| 55 } // namespace ash | 56 } // namespace shelf |
| 57 } // namespace mash |
| 56 | 58 |
| 57 #endif // ASH_SHELF_SHELF_TYPES_H_ | 59 #endif // MASH_SHELF_SHELF_TYPES_H_ |
| OLD | NEW |