| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_SYSTEM_TRAY_SYSTEM_MENU_BUTTON_H_ | 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_MENU_BUTTON_H_ |
| 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_MENU_BUTTON_H_ | 6 #define ASH_SYSTEM_TRAY_SYSTEM_MENU_BUTTON_H_ |
| 7 | 7 |
| 8 #include "ash/common/system/tray/tray_popup_ink_drop_style.h" | |
| 9 #include "ash/resources/vector_icons/vector_icons.h" | 8 #include "ash/resources/vector_icons/vector_icons.h" |
| 9 #include "ash/system/tray/tray_popup_ink_drop_style.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/optional.h" | 11 #include "base/optional.h" |
| 12 #include "ui/gfx/image/image_skia.h" | 12 #include "ui/gfx/image/image_skia.h" |
| 13 #include "ui/views/controls/button/button.h" | 13 #include "ui/views/controls/button/button.h" |
| 14 #include "ui/views/controls/button/image_button.h" | 14 #include "ui/views/controls/button/image_button.h" |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 | 17 |
| 18 // A 48x48 image button with a material design ripple effect, which can be | 18 // A 48x48 image button with a material design ripple effect, which can be |
| 19 // used across Ash material design native UI menus. | 19 // used across Ash material design native UI menus. |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 // The color to use when creating the ink drop. If null the default color is | 64 // The color to use when creating the ink drop. If null the default color is |
| 65 // used as defined by TrayPopupUtils::CreateInkDropRipple() and | 65 // used as defined by TrayPopupUtils::CreateInkDropRipple() and |
| 66 // TrayPopupUtils::CreateInkDropHighlight(). | 66 // TrayPopupUtils::CreateInkDropHighlight(). |
| 67 base::Optional<SkColor> ink_drop_color_; | 67 base::Optional<SkColor> ink_drop_color_; |
| 68 | 68 |
| 69 DISALLOW_COPY_AND_ASSIGN(SystemMenuButton); | 69 DISALLOW_COPY_AND_ASSIGN(SystemMenuButton); |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 } // namespace ash | 72 } // namespace ash |
| 73 | 73 |
| 74 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_MENU_BUTTON_H_ | 74 #endif // ASH_SYSTEM_TRAY_SYSTEM_MENU_BUTTON_H_ |
| OLD | NEW |