| 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_BUTTON_H_ | 5 #ifndef ASH_COMMON_SHELF_SHELF_BUTTON_H_ |
| 6 #define ASH_SHELF_SHELF_BUTTON_H_ | 6 #define ASH_COMMON_SHELF_SHELF_BUTTON_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/gfx/shadow_value.h" | 10 #include "ui/gfx/shadow_value.h" |
| 11 #include "ui/views/controls/button/custom_button.h" | 11 #include "ui/views/controls/button/custom_button.h" |
| 12 #include "ui/views/controls/image_view.h" | 12 #include "ui/views/controls/image_view.h" |
| 13 | 13 |
| 14 namespace ash { | 14 namespace ash { |
| 15 class InkDropButtonListener; | 15 class InkDropButtonListener; |
| 16 class ShelfView; | 16 class ShelfView; |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 | 118 |
| 119 // If non-null the destuctor sets this to true. This is set while the menu is | 119 // If non-null the destuctor sets this to true. This is set while the menu is |
| 120 // showing and used to detect if the menu was deleted while running. | 120 // showing and used to detect if the menu was deleted while running. |
| 121 bool* destroyed_flag_; | 121 bool* destroyed_flag_; |
| 122 | 122 |
| 123 DISALLOW_COPY_AND_ASSIGN(ShelfButton); | 123 DISALLOW_COPY_AND_ASSIGN(ShelfButton); |
| 124 }; | 124 }; |
| 125 | 125 |
| 126 } // namespace ash | 126 } // namespace ash |
| 127 | 127 |
| 128 #endif // ASH_SHELF_SHELF_BUTTON_H_ | 128 #endif // ASH_COMMON_SHELF_SHELF_BUTTON_H_ |
| OLD | NEW |