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

Side by Side Diff: ash/display/window_tree_host_manager_unittest.cc

Issue 1300803003: Drop ui::TouchEvent shims for radius_{x,y} and force (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 unified diff | Download patch
« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/touch/touch_hud_debug.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/display/window_tree_host_manager.h" 5 #include "ash/display/window_tree_host_manager.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/display/display_info.h" 8 #include "ash/display/display_info.h"
9 #include "ash/display/display_layout_store.h" 9 #include "ash/display/display_layout_store.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 target_root_ = target->GetRootWindow(); 292 target_root_ = target->GetRootWindow();
293 event->StopPropagation(); 293 event->StopPropagation();
294 } 294 }
295 295
296 void OnTouchEvent(ui::TouchEvent* event) override { 296 void OnTouchEvent(ui::TouchEvent* event) override {
297 aura::Window* target = static_cast<aura::Window*>(event->target()); 297 aura::Window* target = static_cast<aura::Window*>(event->target());
298 // Only record when the target is the background which covers 298 // Only record when the target is the background which covers
299 // entire root window. 299 // entire root window.
300 if (target->name() != kDesktopBackgroundView) 300 if (target->name() != kDesktopBackgroundView)
301 return; 301 return;
302 touch_radius_x_ = event->radius_x(); 302 touch_radius_x_ = event->pointer_details().radius_x();
303 touch_radius_y_ = event->radius_y(); 303 touch_radius_y_ = event->pointer_details().radius_y();
304 event->StopPropagation(); 304 event->StopPropagation();
305 } 305 }
306 306
307 void OnScrollEvent(ui::ScrollEvent* event) override { 307 void OnScrollEvent(ui::ScrollEvent* event) override {
308 aura::Window* target = static_cast<aura::Window*>(event->target()); 308 aura::Window* target = static_cast<aura::Window*>(event->target());
309 // Only record when the target is the background which covers 309 // Only record when the target is the background which covers
310 // entire root window. 310 // entire root window.
311 if (target->name() != kDesktopBackgroundView) 311 if (target->name() != kDesktopBackgroundView)
312 return; 312 return;
313 313
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1468 widget->GetNativeWindow()->GetRootWindow()); 1468 widget->GetNativeWindow()->GetRootWindow());
1469 event_generator.MoveMouseToCenterOf(widget->GetNativeWindow()); 1469 event_generator.MoveMouseToCenterOf(widget->GetNativeWindow());
1470 1470
1471 UpdateDisplay("300x300"); 1471 UpdateDisplay("300x300");
1472 watcher.Stop(); 1472 watcher.Stop();
1473 1473
1474 widget->CloseNow(); 1474 widget->CloseNow();
1475 } 1475 }
1476 1476
1477 } // namespace ash 1477 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/touch/touch_hud_debug.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698