| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "ash/system/user/button_from_view.h" |
| 6 |
| 5 #include <vector> | 7 #include <vector> |
| 6 | 8 |
| 7 #include "ash/common/system/user/button_from_view.h" | |
| 8 | |
| 9 #include "ash/common/ash_constants.h" | 9 #include "ash/common/ash_constants.h" |
| 10 #include "ash/common/system/tray/tray_constants.h" | 10 #include "ash/system/tray/tray_constants.h" |
| 11 #include "ash/common/system/tray/tray_popup_utils.h" | 11 #include "ash/system/tray/tray_popup_utils.h" |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "ui/accessibility/ax_node_data.h" | 14 #include "ui/accessibility/ax_node_data.h" |
| 15 #include "ui/gfx/canvas.h" | 15 #include "ui/gfx/canvas.h" |
| 16 #include "ui/views/animation/flood_fill_ink_drop_ripple.h" | 16 #include "ui/views/animation/flood_fill_ink_drop_ripple.h" |
| 17 #include "ui/views/animation/ink_drop.h" | 17 #include "ui/views/animation/ink_drop.h" |
| 18 #include "ui/views/animation/ink_drop_highlight.h" | 18 #include "ui/views/animation/ink_drop_highlight.h" |
| 19 #include "ui/views/animation/ink_drop_impl.h" | 19 #include "ui/views/animation/ink_drop_impl.h" |
| 20 #include "ui/views/animation/ink_drop_mask.h" | 20 #include "ui/views/animation/ink_drop_mask.h" |
| 21 #include "ui/views/layout/fill_layout.h" | 21 #include "ui/views/layout/fill_layout.h" |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 ButtonFromView::CreateInkDropHighlight() const { | 124 ButtonFromView::CreateInkDropHighlight() const { |
| 125 return TrayPopupUtils::CreateInkDropHighlight(ink_drop_style_, this); | 125 return TrayPopupUtils::CreateInkDropHighlight(ink_drop_style_, this); |
| 126 } | 126 } |
| 127 | 127 |
| 128 std::unique_ptr<views::InkDropMask> ButtonFromView::CreateInkDropMask() const { | 128 std::unique_ptr<views::InkDropMask> ButtonFromView::CreateInkDropMask() const { |
| 129 return TrayPopupUtils::CreateInkDropMask(ink_drop_style_, this); | 129 return TrayPopupUtils::CreateInkDropMask(ink_drop_style_, this); |
| 130 } | 130 } |
| 131 | 131 |
| 132 } // namespace tray | 132 } // namespace tray |
| 133 } // namespace ash | 133 } // namespace ash |
| OLD | NEW |