| 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_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_ | 5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_ |
| 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_ | 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "ash/common/system/tray/special_popup_row.h" | 11 #include "ash/common/system/tray/special_popup_row.h" |
| 12 #include "ash/common/system/tray/tray_constants.h" | 12 #include "ash/common/system/tray/tray_constants.h" |
| 13 #include "ash/common/system/tray/view_click_listener.h" | 13 #include "ash/common/system/tray/view_click_listener.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "grit/ash_strings.h" | 15 #include "base/timer/timer.h" |
| 16 #include "ui/views/controls/button/button.h" | 16 #include "ui/views/controls/button/button.h" |
| 17 #include "ui/views/view.h" | 17 #include "ui/views/view.h" |
| 18 | 18 |
| 19 namespace base { | |
| 20 class OneShotTimer; | |
| 21 } // namespace base | |
| 22 | |
| 23 namespace views { | 19 namespace views { |
| 24 class BoxLayout; | 20 class BoxLayout; |
| 25 class CustomButton; | 21 class CustomButton; |
| 26 class ProgressBar; | 22 class ProgressBar; |
| 27 class ScrollView; | 23 class ScrollView; |
| 28 } // namespace views | 24 } // namespace views |
| 29 | 25 |
| 30 namespace ash { | 26 namespace ash { |
| 31 namespace test { | 27 namespace test { |
| 32 class TrayDetailsViewTest; | 28 class TrayDetailsViewTest; |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 | 128 |
| 133 ScrollBorder* scroll_border_; // Weak reference | 129 ScrollBorder* scroll_border_; // Weak reference |
| 134 | 130 |
| 135 // The container view for the top-most title row in material design. | 131 // The container view for the top-most title row in material design. |
| 136 TriView* tri_view_; | 132 TriView* tri_view_; |
| 137 | 133 |
| 138 // The back button that appears in the material design title row. Not owned. | 134 // The back button that appears in the material design title row. Not owned. |
| 139 views::Button* back_button_; | 135 views::Button* back_button_; |
| 140 | 136 |
| 141 // Used to delay the transition to the default view. | 137 // Used to delay the transition to the default view. |
| 142 std::unique_ptr<base::OneShotTimer> transition_delay_timer_; | 138 base::OneShotTimer transition_delay_timer_; |
| 143 | 139 |
| 144 DISALLOW_COPY_AND_ASSIGN(TrayDetailsView); | 140 DISALLOW_COPY_AND_ASSIGN(TrayDetailsView); |
| 145 }; | 141 }; |
| 146 | 142 |
| 147 } // namespace ash | 143 } // namespace ash |
| 148 | 144 |
| 149 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_ | 145 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_ |
| OLD | NEW |