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

Side by Side Diff: ash/touch/touch_uma.cc

Issue 814313002: Revert of Use template specialization to generate WindowProperty code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 unified diff | Download patch
« no previous file with comments | « ash/shelf/shelf_util.cc ('k') | ash/wm/system_modal_container_layout_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/touch/touch_uma.h" 5 #include "ash/touch/touch_uma.h"
6 6
7 #include "ash/metrics/user_metrics_recorder.h" 7 #include "ash/metrics/user_metrics_recorder.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 28 matching lines...) Expand all
39 // multi-touch gesture on the window, then this is the release-time of the 39 // multi-touch gesture on the window, then this is the release-time of the
40 // last touch on the window). 40 // last touch on the window).
41 base::TimeDelta last_mt_time_; 41 base::TimeDelta last_mt_time_;
42 }; 42 };
43 43
44 DEFINE_OWNED_WINDOW_PROPERTY_KEY(WindowTouchDetails, 44 DEFINE_OWNED_WINDOW_PROPERTY_KEY(WindowTouchDetails,
45 kWindowTouchDetails, 45 kWindowTouchDetails,
46 NULL); 46 NULL);
47 } 47 }
48 48
49 DECLARE_WINDOW_PROPERTY_TYPE(WindowTouchDetails*);
50
51 namespace ash { 49 namespace ash {
52 50
53 // static 51 // static
54 TouchUMA* TouchUMA::GetInstance() { 52 TouchUMA* TouchUMA::GetInstance() {
55 return Singleton<TouchUMA>::get(); 53 return Singleton<TouchUMA>::get();
56 } 54 }
57 55
58 void TouchUMA::RecordGestureEvent(aura::Window* target, 56 void TouchUMA::RecordGestureEvent(aura::Window* target,
59 const ui::GestureEvent& event) { 57 const ui::GestureEvent& event) {
60 GestureActionType action = FindGestureActionType(target, event); 58 GestureActionType action = FindGestureActionType(target, event);
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 return GESTURE_OMNIBOX_SCROLL; 295 return GESTURE_OMNIBOX_SCROLL;
298 if (event.type() == ui::ET_GESTURE_PINCH_BEGIN) 296 if (event.type() == ui::ET_GESTURE_PINCH_BEGIN)
299 return GESTURE_OMNIBOX_PINCH; 297 return GESTURE_OMNIBOX_PINCH;
300 return GESTURE_UNKNOWN; 298 return GESTURE_UNKNOWN;
301 } 299 }
302 300
303 return GESTURE_UNKNOWN; 301 return GESTURE_UNKNOWN;
304 } 302 }
305 303
306 } // namespace ash 304 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_util.cc ('k') | ash/wm/system_modal_container_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698