| Index: components/mus/ws/window_manager_client_apptest.cc
|
| diff --git a/components/mus/ws/window_manager_client_apptest.cc b/components/mus/ws/window_manager_client_apptest.cc
|
| index b204b6cd8f6a4661bd6d92ec4dbac0c5a5491eda..610504760a0cf338efd14bc70cdaca0a90c9271b 100644
|
| --- a/components/mus/ws/window_manager_client_apptest.cc
|
| +++ b/components/mus/ws/window_manager_client_apptest.cc
|
| @@ -61,7 +61,7 @@ class ClientAreaChangeObserver : public WindowObserver {
|
| private:
|
| // Overridden from WindowObserver:
|
| void OnWindowClientAreaChanged(Window* window,
|
| - const gfx::Rect& old_client_area) override {
|
| + const gfx::Insets& old_client_area) override {
|
| DCHECK_EQ(window, window_);
|
| EXPECT_TRUE(WindowServerTestBase::QuitRunLoop());
|
| }
|
| @@ -879,16 +879,16 @@ TEST_F(WindowServerTest, ClientAreaChanged) {
|
| WindowTreeConnection* embedded_connection = Embed(embed_window).connection;
|
|
|
| // Verify change from embedded makes it to parent.
|
| - embedded_connection->GetRoot()->SetClientArea(gfx::Rect(1, 2, 3, 4));
|
| + embedded_connection->GetRoot()->SetClientArea(gfx::Insets(1, 2, 3, 4));
|
| ASSERT_TRUE(WaitForClientAreaToChange(embed_window));
|
| - EXPECT_TRUE(gfx::Rect(1, 2, 3, 4) == embed_window->client_area());
|
| + EXPECT_TRUE(gfx::Insets(1, 2, 3, 4) == embed_window->client_area());
|
|
|
| - // Verify bounds change results in resetting client area in embedded.
|
| + // Changing bounds shouldn't effect client area.
|
| embed_window->SetBounds(gfx::Rect(21, 22, 23, 24));
|
| WaitForBoundsToChange(embedded_connection->GetRoot());
|
| EXPECT_TRUE(gfx::Rect(21, 22, 23, 24) ==
|
| embedded_connection->GetRoot()->bounds());
|
| - EXPECT_TRUE(gfx::Rect(0, 0, 23, 24) ==
|
| + EXPECT_TRUE(gfx::Insets(1, 2, 3, 4) ==
|
| embedded_connection->GetRoot()->client_area());
|
| }
|
|
|
|
|