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

Unified Diff: ash/display/root_window_transformers_unittest.cc

Issue 289583002: Lock rotation when screen is manually rotated. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Define sources for rotation Created 6 years, 7 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/root_window_transformers_unittest.cc
diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc
index 62d768162d341ed821ebc3235eda812afd5a5a7b..1f77ee51b3a69312ffee719b4df8f675e88f8163 100644
--- a/ash/display/root_window_transformers_unittest.cc
+++ b/ash/display/root_window_transformers_unittest.cc
@@ -20,6 +20,7 @@
#include "ui/aura/test/event_generator.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_tracker.h"
+#include "ui/display/types/display_constants.h"
#include "ui/events/event_handler.h"
#include "ui/gfx/display.h"
#include "ui/gfx/rect_conversions.h"
@@ -162,7 +163,8 @@ TEST_F(RootWindowTransformersTest, MAYBE_RotateAndMagnify) {
magnifier->SetEnabled(false);
display_manager->SetDisplayRotation(display1.id(),
- gfx::Display::ROTATE_90);
+ gfx::Display::ROTATE_90,
+ ui::USER);
// Move the cursor to the center of the first root window.
generator1.MoveMouseToInHost(59, 100);
@@ -186,7 +188,8 @@ TEST_F(RootWindowTransformersTest, MAYBE_RotateAndMagnify) {
ScreenUtil::GetSecondaryDisplay().bounds().ToString());
display_manager->SetDisplayRotation(display2_id,
- gfx::Display::ROTATE_270);
+ gfx::Display::ROTATE_270,
+ ui::USER);
// Move the cursor to the center of the second root window.
generator2.MoveMouseToInHost(151, 199);
@@ -204,7 +207,8 @@ TEST_F(RootWindowTransformersTest, MAYBE_RotateAndMagnify) {
magnifier->SetEnabled(false);
display_manager->SetDisplayRotation(display1.id(),
- gfx::Display::ROTATE_180);
+ gfx::Display::ROTATE_180,
+ ui::USER);
// Move the cursor to the center of the first root window.
generator1.MoveMouseToInHost(59, 99);

Powered by Google App Engine
This is Rietveld 408576698