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 #ifndef ASH_SYSTEM_USER_BUTTON_FROM_VIEW_H_ | 5 #ifndef ASH_COMMON_SYSTEM_USER_BUTTON_FROM_VIEW_H_ |
6 #define ASH_SYSTEM_USER_BUTTON_FROM_VIEW_H_ | 6 #define ASH_COMMON_SYSTEM_USER_BUTTON_FROM_VIEW_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "ash/system/tray/tray_popup_ink_drop_style.h" | 10 #include "ash/common/system/tray/tray_popup_ink_drop_style.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "ui/views/controls/button/custom_button.h" | 12 #include "ui/views/controls/button/custom_button.h" |
13 | 13 |
14 namespace views { | 14 namespace views { |
15 class InkDropContainerView; | 15 class InkDropContainerView; |
16 } // namespace views | 16 } // namespace views |
17 | 17 |
18 namespace ash { | 18 namespace ash { |
19 namespace tray { | 19 namespace tray { |
20 | 20 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 views::InkDropContainerView* ink_drop_container_; | 66 views::InkDropContainerView* ink_drop_container_; |
67 | 67 |
68 std::unique_ptr<views::InkDropMask> ink_drop_mask_; | 68 std::unique_ptr<views::InkDropMask> ink_drop_mask_; |
69 | 69 |
70 DISALLOW_COPY_AND_ASSIGN(ButtonFromView); | 70 DISALLOW_COPY_AND_ASSIGN(ButtonFromView); |
71 }; | 71 }; |
72 | 72 |
73 } // namespace tray | 73 } // namespace tray |
74 } // namespace ash | 74 } // namespace ash |
75 | 75 |
76 #endif // ASH_SYSTEM_USER_BUTTON_FROM_VIEW_H_ | 76 #endif // ASH_COMMON_SYSTEM_USER_BUTTON_FROM_VIEW_H_ |
OLD | NEW |