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

Unified Diff: ash/common/system/tray/system_tray_item.h

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/status_area_widget_delegate.cc ('k') | ash/common/system/tray/system_tray_item.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray_item.h
diff --git a/ash/common/system/tray/system_tray_item.h b/ash/common/system/tray/system_tray_item.h
index 2e7ca00dd71c2103ba35b3908faf15b58a9bedd8..68f1966bd44607cc70dc95df76717db99f2d44cc 100644
--- a/ash/common/system/tray/system_tray_item.h
+++ b/ash/common/system/tray/system_tray_item.h
@@ -11,10 +11,7 @@
#include "ash/common/login_status.h"
#include "ash/public/cpp/shelf_types.h"
#include "base/macros.h"
-
-namespace base {
-class OneShotTimer;
-} // namespace base
+#include "base/timer/timer.h"
namespace views {
class View;
@@ -154,9 +151,6 @@ class ASH_EXPORT SystemTrayItem {
void set_restore_focus(bool restore_focus) { restore_focus_ = restore_focus; }
private:
- // Actually transitions to the detailed view.
- void DoTransitionToDetailedView();
-
// Accesses uma_type().
friend class SystemTrayBubble;
@@ -167,7 +161,7 @@ class ASH_EXPORT SystemTrayItem {
bool restore_focus_;
// Used to delay the transition to the detailed view.
- std::unique_ptr<base::OneShotTimer> transition_delay_timer_;
+ base::OneShotTimer transition_delay_timer_;
DISALLOW_COPY_AND_ASSIGN(SystemTrayItem);
};
« no previous file with comments | « ash/common/system/status_area_widget_delegate.cc ('k') | ash/common/system/tray/system_tray_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698