Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: ash/common/system/tray/tray_details_view.cc

Issue 2698213004: Start removing some pre-md constants and related code. (Closed)
Patch Set: actually use the constant Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/tray/tray_details_view.h ('k') | ash/common/system/tray/tray_details_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b7749501be1542865fa3fd33e617cf191f33d209..4cf0f97b8468023b6b2ab40ecde127db7195a7f0 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"
@@ -458,22 +457,13 @@ 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(kTrayDetailedViewTransitionDelayMs),
+ this, &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_;
« no previous file with comments | « ash/common/system/tray/tray_details_view.h ('k') | ash/common/system/tray/tray_details_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698