Chromium Code Reviews| Index: ash/common/system/tray/tray_details_view.cc |
| diff --git a/ash/common/system/tray/tray_details_view.cc b/ash/common/system/tray/tray_details_view.cc |
| index e2570fe6d634d20fa60018e0a2481bfc219920a8..3c6e37478fbe44470ed472a5711fabf735b24420 100644 |
| --- a/ash/common/system/tray/tray_details_view.cc |
| +++ b/ash/common/system/tray/tray_details_view.cc |
| @@ -15,7 +15,6 @@ |
| #include "ash/common/system/tray/tri_view.h" |
| #include "base/containers/adapters.h" |
| #include "base/memory/ptr_util.h" |
| -#include "base/timer/timer.h" |
| #include "grit/ash_strings.h" |
| #include "third_party/skia/include/core/SkDrawLooper.h" |
| #include "ui/base/resource/resource_bundle.h" |
| @@ -456,22 +455,12 @@ void TrayDetailsView::TransitionToDefaultView() { |
| return; |
| } |
| - const int transition_delay = |
| - GetTrayConstant(TRAY_POPUP_TRANSITION_TO_DEFAULT_DELAY); |
| - if (transition_delay <= 0) { |
| - DoTransitionToDefaultView(); |
| - return; |
| - } |
| - |
| - transition_delay_timer_.reset(new base::OneShotTimer()); |
| - transition_delay_timer_->Start( |
| - FROM_HERE, base::TimeDelta::FromMilliseconds(transition_delay), this, |
| - &TrayDetailsView::DoTransitionToDefaultView); |
| + transition_delay_timer_.Start(FROM_HERE, |
| + base::TimeDelta::FromMilliseconds(100), this, |
|
tdanderson
2017/02/17 21:46:11
Use kTrayDetailedViewTransitionDelayMs in place of
Evan Stade
2017/02/17 21:51:33
oops, thanks for catching
|
| + &TrayDetailsView::DoTransitionToDefaultView); |
| } |
| void TrayDetailsView::DoTransitionToDefaultView() { |
| - transition_delay_timer_.reset(); |
| - |
| // Cache pointer to owner in this function scope. TrayDetailsView will be |
| // deleted after called ShowDefaultView. |
| SystemTrayItem* owner = owner_; |