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

Unified Diff: ash/display/screen_position_controller_unittest.cc

Issue 2524873002: Rename WindowTreeHost G|SetBounds to indicate they are in pixels. (Closed)
Patch Set: rebase Created 4 years, 1 month 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/screen_position_controller.cc ('k') | ash/display/unified_mouse_warp_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_position_controller_unittest.cc
diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc
index 8784abf19d36198062bb7d24ad20cc692f2f9e72..bf7a12d6f5bd3cd11c846f10346be55a9e435498 100644
--- a/ash/display/screen_position_controller_unittest.cc
+++ b/ash/display/screen_position_controller_unittest.cc
@@ -107,14 +107,16 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreen) {
aura::Window::Windows root_windows =
Shell::GetInstance()->GetAllRootWindows();
- EXPECT_EQ("100,100",
- root_windows[0]->GetHost()->GetBounds().origin().ToString());
+ EXPECT_EQ(
+ "100,100",
+ root_windows[0]->GetHost()->GetBoundsInPixels().origin().ToString());
EXPECT_EQ("200x200",
- root_windows[0]->GetHost()->GetBounds().size().ToString());
- EXPECT_EQ("100,500",
- root_windows[1]->GetHost()->GetBounds().origin().ToString());
+ root_windows[0]->GetHost()->GetBoundsInPixels().size().ToString());
+ EXPECT_EQ(
+ "100,500",
+ root_windows[1]->GetHost()->GetBoundsInPixels().origin().ToString());
EXPECT_EQ("200x200",
- root_windows[1]->GetHost()->GetBounds().size().ToString());
+ root_windows[1]->GetHost()->GetBoundsInPixels().size().ToString());
const gfx::Point window_pos(100, 100);
window_->SetBoundsInScreen(
@@ -195,9 +197,9 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenHiDPI) {
aura::Window::Windows root_windows =
Shell::GetInstance()->GetAllRootWindows();
EXPECT_EQ("50,50 200x200",
- root_windows[0]->GetHost()->GetBounds().ToString());
+ root_windows[0]->GetHost()->GetBoundsInPixels().ToString());
EXPECT_EQ("50,300 300x300",
- root_windows[1]->GetHost()->GetBounds().ToString());
+ root_windows[1]->GetHost()->GetBoundsInPixels().ToString());
// Put |window_| to the primary 2x display.
window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50),
« no previous file with comments | « ash/display/screen_position_controller.cc ('k') | ash/display/unified_mouse_warp_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698