| Index: ash/common/system/tray/tray_details_view.h
|
| diff --git a/ash/common/system/tray/tray_details_view.h b/ash/common/system/tray/tray_details_view.h
|
| index d7046e7c8e1f34efaee83b213db24541eff96b1c..2828763536eeed8422cd3eedd13264d109a0ec78 100644
|
| --- a/ash/common/system/tray/tray_details_view.h
|
| +++ b/ash/common/system/tray/tray_details_view.h
|
| @@ -12,14 +12,10 @@
|
| #include "ash/common/system/tray/tray_constants.h"
|
| #include "ash/common/system/tray/view_click_listener.h"
|
| #include "base/macros.h"
|
| -#include "grit/ash_strings.h"
|
| +#include "base/timer/timer.h"
|
| #include "ui/views/controls/button/button.h"
|
| #include "ui/views/view.h"
|
|
|
| -namespace base {
|
| -class OneShotTimer;
|
| -} // namespace base
|
| -
|
| namespace views {
|
| class BoxLayout;
|
| class CustomButton;
|
| @@ -139,7 +135,7 @@ class ASH_EXPORT TrayDetailsView : public views::View,
|
| views::Button* back_button_;
|
|
|
| // Used to delay the transition to the default view.
|
| - std::unique_ptr<base::OneShotTimer> transition_delay_timer_;
|
| + base::OneShotTimer transition_delay_timer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TrayDetailsView);
|
| };
|
|
|