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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « ash/touch/touch_observer_hud_unittest.cc ('k') | ash/utility/screenshot_controller.h » ('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/wm_shell.h" 7 #include "ash/common/wm_shell.h"
8 #include "base/metrics/histogram_macros.h" 8 #include "base/metrics/histogram_macros.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "ui/aura/env.h" 10 #include "ui/aura/env.h"
11 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
12 #include "ui/aura/window_event_dispatcher.h" 12 #include "ui/aura/window_event_dispatcher.h"
13 #include "ui/base/class_property.h" 13 #include "ui/base/class_property.h"
14 #include "ui/events/event.h" 14 #include "ui/events/event.h"
15 #include "ui/events/event_utils.h" 15 #include "ui/events/event_utils.h"
16 #include "ui/gfx/geometry/point_conversions.h" 16 #include "ui/gfx/geometry/point_conversions.h"
17 #include "ui/views/widget/widget.h" 17 #include "ui/views/widget/widget.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 return GESTURE_OMNIBOX_SCROLL; 206 return GESTURE_OMNIBOX_SCROLL;
207 if (event.type() == ui::ET_GESTURE_PINCH_BEGIN) 207 if (event.type() == ui::ET_GESTURE_PINCH_BEGIN)
208 return GESTURE_OMNIBOX_PINCH; 208 return GESTURE_OMNIBOX_PINCH;
209 return GESTURE_UNKNOWN; 209 return GESTURE_UNKNOWN;
210 } 210 }
211 211
212 return GESTURE_UNKNOWN; 212 return GESTURE_UNKNOWN;
213 } 213 }
214 214
215 } // namespace ash 215 } // namespace ash
OLDNEW
« no previous file with comments | « ash/touch/touch_observer_hud_unittest.cc ('k') | ash/utility/screenshot_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698