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

Unified Diff: ui/app_list/views/apps_grid_view.h

Issue 1355063004: Template methods on Timer classes instead of the classes themselves. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: timer: fixcaller Created 5 years, 3 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 | « ui/app_list/views/app_list_main_view_unittest.cc ('k') | ui/app_list/views/pulsing_block_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/apps_grid_view.h
diff --git a/ui/app_list/views/apps_grid_view.h b/ui/app_list/views/apps_grid_view.h
index d8e2ede49ef6a7ed77fedf31edf3f161a9fedcf3..8200c7326990c9687da48bab1c1d3e84936729d0 100644
--- a/ui/app_list/views/apps_grid_view.h
+++ b/ui/app_list/views/apps_grid_view.h
@@ -534,14 +534,14 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
DropAttempt drop_attempt_;
// Timer for re-ordering the |drop_target_| and |drag_view_|.
- base::OneShotTimer<AppsGridView> reorder_timer_;
+ base::OneShotTimer reorder_timer_;
// Timer for dropping |drag_view_| into the folder containing
// the |drop_target_|.
- base::OneShotTimer<AppsGridView> folder_dropping_timer_;
+ base::OneShotTimer folder_dropping_timer_;
// Timer for dragging a folder item out of folder container ink bubble.
- base::OneShotTimer<AppsGridView> folder_item_reparent_timer_;
+ base::OneShotTimer folder_item_reparent_timer_;
// An application target drag and drop host which accepts dnd operations.
ApplicationDragAndDropHost* drag_and_drop_host_;
@@ -554,7 +554,7 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
gfx::Point last_drag_point_;
// Timer to auto flip page when dragging an item near the left/right edges.
- base::OneShotTimer<AppsGridView> page_flip_timer_;
+ base::OneShotTimer page_flip_timer_;
// Target page to switch to when |page_flip_timer_| fires.
int page_flip_target_;
« no previous file with comments | « ui/app_list/views/app_list_main_view_unittest.cc ('k') | ui/app_list/views/pulsing_block_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698