diff options
| author | sky <sky@chromium.org> | 2016-02-02 15:52:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-02 23:54:37 +0000 |
| commit | c9de9707b8b879837f82e7f427638d395b489a20 (patch) | |
| tree | 9c9f7753b0a688b27dd0c15203533df72fa69b51 /components/mus/ws/window_tree_unittest.cc | |
| parent | 32d723e7e2766e4ef67eb1fa7206382566aff73f (diff) | |
| download | chromium_src-c9de9707b8b879837f82e7f427638d395b489a20.zip chromium_src-c9de9707b8b879837f82e7f427638d395b489a20.tar.gz chromium_src-c9de9707b8b879837f82e7f427638d395b489a20.tar.bz2 | |
Moves more functions off WindowTreeHost onto WindowManagerClient
I also nuked WindowTreeHostClient.
BUG=581198
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/1658983005
Cr-Commit-Position: refs/heads/master@{#373079}
Diffstat (limited to 'components/mus/ws/window_tree_unittest.cc')
| -rw-r--r-- | components/mus/ws/window_tree_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/mus/ws/window_tree_unittest.cc b/components/mus/ws/window_tree_unittest.cc index f4a1327..739ffe0 100644 --- a/components/mus/ws/window_tree_unittest.cc +++ b/components/mus/ws/window_tree_unittest.cc @@ -472,8 +472,7 @@ class WindowTreeTest : public testing::Test { connection_manager_.reset( new ConnectionManager(&delegate_, scoped_refptr<SurfacesState>())); WindowTreeHostImpl* host = new WindowTreeHostImpl( - mus::mojom::WindowTreeHostClientPtr(), connection_manager_.get(), - nullptr, scoped_refptr<GpuState>(), + connection_manager_.get(), nullptr, scoped_refptr<GpuState>(), scoped_refptr<mus::SurfacesState>()); // TODO(fsamuel): This is way too magical. We need to find a better way to // manage lifetime. @@ -535,7 +534,7 @@ void WindowTreeTest::SetupEventTargeting( ASSERT_TRUE(child1); EXPECT_TRUE(connection1->AddWindow( ClientWindowIdForWindow(connection1, embed_window), child1_id)); - connection1->GetHost(embed_window)->AddActivationParent(embed_window_id.id); + connection1->GetHost(embed_window)->AddActivationParent(embed_window); child1->SetVisible(true); child1->SetBounds(gfx::Rect(20, 20, 20, 20)); @@ -603,7 +602,7 @@ TEST_F(WindowTreeTest, FocusOnPointer) { connection1_client->tracker()->changes()->clear(); wm_client()->tracker()->changes()->clear(); - host1->AddActivationParent(embed_window_id.id); + host1->AddActivationParent(embed_window); // Focus should go to child1. This result in notifying both the window // manager and client connection being notified. |