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

Unified Diff: ui/aura/mus/window_tree_client_unittest.cc

Issue 2524873002: Rename WindowTreeHost G|SetBounds to indicate they are in pixels. (Closed)
Patch Set: 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
Index: ui/aura/mus/window_tree_client_unittest.cc
diff --git a/ui/aura/mus/window_tree_client_unittest.cc b/ui/aura/mus/window_tree_client_unittest.cc
index ae2802e1e1919be6b8309af5d86afa289005ff98..170a84df7c3712307c3e1f1d7a7e0812dfc27a32 100644
--- a/ui/aura/mus/window_tree_client_unittest.cc
+++ b/ui/aura/mus/window_tree_client_unittest.cc
@@ -492,10 +492,10 @@ TEST_F(WindowTreeClientClientTest, InputEventBasic) {
WindowTreeHostMus window_tree_host(window_tree_client_impl());
Window* top_level = window_tree_host.window();
const gfx::Rect bounds(0, 0, 100, 100);
- window_tree_host.SetBounds(bounds);
+ window_tree_host.SetBoundsInPixel(bounds);
window_tree_host.Show();
EXPECT_EQ(bounds, top_level->bounds());
- EXPECT_EQ(bounds, window_tree_host.GetBounds());
+ EXPECT_EQ(bounds, window_tree_host.GetBoundsInPixel());
Window child(&window_delegate);
child.Init(ui::LAYER_NOT_DRAWN);
top_level->AddChild(&child);
@@ -789,7 +789,7 @@ TEST_F(WindowTreeClientClientTest, NewTopLevelWindowGetsPropertiesFromData) {
// TODO: check display_id.
EXPECT_EQ(display_id, window_tree_host.display_id());
EXPECT_EQ(gfx::Rect(0, 0, 3, 4), top_level->bounds());
- EXPECT_EQ(gfx::Rect(1, 2, 3, 4), top_level->GetHost()->GetBounds());
+ EXPECT_EQ(gfx::Rect(1, 2, 3, 4), top_level->GetHost()->GetBoundsInPixel());
}
TEST_F(WindowTreeClientClientTest, NewWindowGetsAllChangesInFlight) {
@@ -805,7 +805,7 @@ TEST_F(WindowTreeClientClientTest, NewWindowGetsAllChangesInFlight) {
top_level->Hide();
// Change bounds to 5, 6, 7, 8.
- window_tree_host.SetBounds(gfx::Rect(5, 6, 7, 8));
+ window_tree_host.SetBoundsInPixel(gfx::Rect(5, 6, 7, 8));
EXPECT_EQ(gfx::Rect(0, 0, 7, 8), window_tree_host.window()->bounds());
const uint8_t explicitly_set_test_property1_value = 2;
@@ -835,7 +835,7 @@ TEST_F(WindowTreeClientClientTest, NewWindowGetsAllChangesInFlight) {
// The only value that should take effect is the property for 'yy' as it was
// not in flight.
EXPECT_FALSE(top_level->TargetVisibility());
- EXPECT_EQ(gfx::Rect(5, 6, 7, 8), window_tree_host.GetBounds());
+ EXPECT_EQ(gfx::Rect(5, 6, 7, 8), window_tree_host.GetBoundsInPixel());
EXPECT_EQ(gfx::Rect(0, 0, 7, 8), top_level->bounds());
EXPECT_EQ(explicitly_set_test_property1_value,
top_level->GetProperty(kTestPropertyKey1));
@@ -855,7 +855,7 @@ TEST_F(WindowTreeClientClientTest, NewWindowGetsAllChangesInFlight) {
EXPECT_EQ(gfx::Rect(bounds_from_server.size()), top_level->bounds());
// But the bounds of the WindowTreeHost is display relative.
EXPECT_EQ(bounds_from_server,
- top_level->GetRootWindow()->GetHost()->GetBounds());
+ top_level->GetRootWindow()->GetHost()->GetBoundsInPixel());
window_tree()->AckAllChangesOfType(WindowTreeChangeType::PROPERTY, false);
EXPECT_EQ(server_test_property1_value,
top_level->GetProperty(kTestPropertyKey1));

Powered by Google App Engine
This is Rietveld 408576698