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

Unified Diff: ash/display/event_transformation_handler.cc

Issue 12254040: Revert 182494 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | « ash/display/display_manager.cc ('k') | ash/system/chromeos/tray_display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/event_transformation_handler.cc
===================================================================
--- ash/display/event_transformation_handler.cc (revision 182530)
+++ ash/display/event_transformation_handler.cc (working copy)
@@ -4,6 +4,7 @@
#include "ash/display/event_transformation_handler.h"
+#include "ash/display/display_manager.h"
#include "ash/screen_ash.h"
#include "ash/shell.h"
#include "ash/wm/coordinate_conversion.h"
@@ -44,7 +45,8 @@
wm::ConvertPointToScreen(target, &point_in_screen);
const gfx::Display& display =
Shell::GetScreen()->GetDisplayNearestPoint(point_in_screen);
- if (!display.IsInternal())
+ DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+ if (!display_manager->IsInternalDisplayId(display.id()))
scale *= kBoostForNonIntegrated;
event->Scale(scale);
Property changes on: ash/display/event_transformation_handler.cc
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/system/chromeos/tray_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698