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

Unified Diff: ash/magnifier/magnification_controller_unittest.cc

Issue 2078393005: mash: Move accessibility_types.h from ui namespace to ash namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a11y
Patch Set: fix chromevox code generated from js Created 4 years, 6 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/keyboard/keyboard_ui.cc ('k') | ash/system/ime/tray_ime_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/magnifier/magnification_controller_unittest.cc
diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc
index 4b37e32e7fc22e643c8ce9e148739904bc601861..dbf5891fe8c391d1ab0c5fa89c8a071f18e95cc5 100644
--- a/ash/magnifier/magnification_controller_unittest.cc
+++ b/ash/magnifier/magnification_controller_unittest.cc
@@ -459,7 +459,7 @@ TEST_F(MagnificationControllerTest, PanWindowToRight) {
GetMagnificationController()->SetEnabled(true);
EXPECT_FLOAT_EQ(2.f, GetMagnificationController()->GetScale());
- scale *= ui::kMagnificationScaleFactor;
+ scale *= kMagnificationScaleFactor;
GetMagnificationController()->SetScale(scale, false);
EXPECT_FLOAT_EQ(2.3784142, GetMagnificationController()->GetScale());
GetEventGenerator().MoveMouseToInHost(gfx::Point(400, 300));
@@ -468,21 +468,21 @@ TEST_F(MagnificationControllerTest, PanWindowToRight) {
EXPECT_EQ("566,299", env->last_mouse_location().ToString());
EXPECT_EQ("705,300", GetHostMouseLocation());
- scale *= ui::kMagnificationScaleFactor;
+ scale *= kMagnificationScaleFactor;
GetMagnificationController()->SetScale(scale, false);
EXPECT_FLOAT_EQ(2.8284268, GetMagnificationController()->GetScale());
GetEventGenerator().MoveMouseToInHost(gfx::Point(799, 300));
EXPECT_EQ("599,299", env->last_mouse_location().ToString());
EXPECT_EQ("702,300", GetHostMouseLocation());
- scale *= ui::kMagnificationScaleFactor;
+ scale *= kMagnificationScaleFactor;
GetMagnificationController()->SetScale(scale, false);
EXPECT_FLOAT_EQ(3.3635852, GetMagnificationController()->GetScale());
GetEventGenerator().MoveMouseToInHost(gfx::Point(799, 300));
EXPECT_EQ("627,298", env->last_mouse_location().ToString());
EXPECT_EQ("707,300", GetHostMouseLocation());
- scale *= ui::kMagnificationScaleFactor;
+ scale *= kMagnificationScaleFactor;
GetMagnificationController()->SetScale(scale, false);
EXPECT_FLOAT_EQ(4.f, GetMagnificationController()->GetScale());
GetEventGenerator().MoveMouseToInHost(gfx::Point(799, 300));
@@ -504,7 +504,7 @@ TEST_F(MagnificationControllerTest, PanWindowToLeft) {
GetMagnificationController()->SetEnabled(true);
EXPECT_FLOAT_EQ(2.f, GetMagnificationController()->GetScale());
- scale *= ui::kMagnificationScaleFactor;
+ scale *= kMagnificationScaleFactor;
GetMagnificationController()->SetScale(scale, false);
EXPECT_FLOAT_EQ(2.3784142, GetMagnificationController()->GetScale());
GetEventGenerator().MoveMouseToInHost(gfx::Point(400, 300));
@@ -513,21 +513,21 @@ TEST_F(MagnificationControllerTest, PanWindowToLeft) {
EXPECT_EQ("231,299", env->last_mouse_location().ToString());
EXPECT_EQ("100,300", GetHostMouseLocation());
- scale *= ui::kMagnificationScaleFactor;
+ scale *= kMagnificationScaleFactor;
GetMagnificationController()->SetScale(scale, false);
EXPECT_FLOAT_EQ(2.8284268, GetMagnificationController()->GetScale());
GetEventGenerator().MoveMouseToInHost(gfx::Point(0, 300));
EXPECT_EQ("194,299", env->last_mouse_location().ToString());
EXPECT_EQ("99,300", GetHostMouseLocation());
- scale *= ui::kMagnificationScaleFactor;
+ scale *= kMagnificationScaleFactor;
GetMagnificationController()->SetScale(scale, false);
EXPECT_FLOAT_EQ(3.3635852, GetMagnificationController()->GetScale());
GetEventGenerator().MoveMouseToInHost(gfx::Point(0, 300));
EXPECT_EQ("164,298", env->last_mouse_location().ToString());
EXPECT_EQ("98,300", GetHostMouseLocation());
- scale *= ui::kMagnificationScaleFactor;
+ scale *= kMagnificationScaleFactor;
GetMagnificationController()->SetScale(scale, false);
EXPECT_FLOAT_EQ(4.f, GetMagnificationController()->GetScale());
GetEventGenerator().MoveMouseToInHost(gfx::Point(0, 300));
« no previous file with comments | « ash/keyboard/keyboard_ui.cc ('k') | ash/system/ime/tray_ime_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698