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

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

Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-5
Patch Set: cros Created 4 years, 11 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/display_manager_unittest.cc ('k') | ash/display/extended_mouse_warp_controller.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/event_transformation_handler.h" 5 #include "ash/display/event_transformation_handler.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "ash/display/display_info.h" 9 #include "ash/display/display_info.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
11 #include "ash/shell.h"
12 #include "ash/wm/window_util.h" 11 #include "ash/wm/window_util.h"
13 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
14 #include "ui/aura/window_event_dispatcher.h" 13 #include "ui/aura/window_event_dispatcher.h"
15 #include "ui/compositor/dip_util.h" 14 #include "ui/compositor/dip_util.h"
16 #include "ui/events/event.h" 15 #include "ui/events/event.h"
17 #include "ui/gfx/display.h" 16 #include "ui/gfx/display.h"
18 #include "ui/gfx/screen.h" 17 #include "ui/gfx/screen.h"
19 #include "ui/wm/core/coordinate_conversion.h" 18 #include "ui/wm/core/coordinate_conversion.h"
20 19
21 namespace ash { 20 namespace ash {
(...skipping 14 matching lines...) Expand all
36 void EventTransformationHandler::OnScrollEvent(ui::ScrollEvent* event) { 35 void EventTransformationHandler::OnScrollEvent(ui::ScrollEvent* event) {
37 if (transformation_mode_ == TRANSFORM_NONE) 36 if (transformation_mode_ == TRANSFORM_NONE)
38 return; 37 return;
39 38
40 // It is unnecessary to scale the event for the device scale factor since 39 // It is unnecessary to scale the event for the device scale factor since
41 // the event locations etc. are already in DIP. 40 // the event locations etc. are already in DIP.
42 gfx::Point point_in_screen(event->location()); 41 gfx::Point point_in_screen(event->location());
43 aura::Window* target = static_cast<aura::Window*>(event->target()); 42 aura::Window* target = static_cast<aura::Window*>(event->target());
44 ::wm::ConvertPointToScreen(target, &point_in_screen); 43 ::wm::ConvertPointToScreen(target, &point_in_screen);
45 const gfx::Display& display = 44 const gfx::Display& display =
46 Shell::GetScreen()->GetDisplayNearestPoint(point_in_screen); 45 gfx::Screen::GetScreen()->GetDisplayNearestPoint(point_in_screen);
47 46
48 // Apply some additional scaling if the display is non-integrated. 47 // Apply some additional scaling if the display is non-integrated.
49 if (!display.IsInternal()) 48 if (!display.IsInternal())
50 event->Scale(kBoostForNonIntegrated); 49 event->Scale(kBoostForNonIntegrated);
51 } 50 }
52 51
53 } // namespace ash 52 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/display/extended_mouse_warp_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698