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

Unified Diff: ash/display/event_transformation_handler.cc

Issue 12217120: Add IsInternal property to gfx::Display (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
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
Index: ash/display/event_transformation_handler.cc
diff --git a/ash/display/event_transformation_handler.cc b/ash/display/event_transformation_handler.cc
index 380399d8b8ef18e3afa90c54a60cef3c033ab6e9..edb669d2206de5ff538bdda502a6a6b96fac0d82 100644
--- a/ash/display/event_transformation_handler.cc
+++ b/ash/display/event_transformation_handler.cc
@@ -4,7 +4,6 @@
#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"
@@ -45,8 +44,7 @@ void EventTransformationHandler::OnScrollEvent(ui::ScrollEvent* event) {
wm::ConvertPointToScreen(target, &point_in_screen);
const gfx::Display& display =
Shell::GetScreen()->GetDisplayNearestPoint(point_in_screen);
- DisplayManager* display_manager = Shell::GetInstance()->display_manager();
- if (!display_manager->IsInternalDisplayId(display.id()))
+ if (!display.is_internal())
scale *= kBoostForNonIntegrated;
event->Scale(scale);

Powered by Google App Engine
This is Rietveld 408576698