diff options
author | ben <ben@chromium.org> | 2016-02-25 23:30:25 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-26 07:31:39 +0000 |
commit | e4a2bc4fb161d8d2ea673d5f55119d36be2cf06f (patch) | |
tree | a09be63e6724713539bd7065ecdcb38b0233a73e /mash/wm/window_manager_apptest.cc | |
parent | 0d78506780d9bf1e5e80a0bfca6099a80fd355e0 (diff) | |
download | chromium_src-e4a2bc4fb161d8d2ea673d5f55119d36be2cf06f.zip chromium_src-e4a2bc4fb161d8d2ea673d5f55119d36be2cf06f.tar.gz chromium_src-e4a2bc4fb161d8d2ea673d5f55119d36be2cf06f.tar.bz2 |
Replace with mojo::Connector (already exists) now that Shell is gone.
Requires:
- Move AppRefCount to a different class, MessageLoopRef, which is optionally used by applications that wish to quit the current message loop started by application runner when the ref drops to zero.
- Changing the signature of Initialize() to take a Connector. This is what most of the change in this CL is.
BUG=
Review URL: https://codereview.chromium.org/1725353003
Cr-Commit-Position: refs/heads/master@{#377841}
Diffstat (limited to 'mash/wm/window_manager_apptest.cc')
-rw-r--r-- | mash/wm/window_manager_apptest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mash/wm/window_manager_apptest.cc b/mash/wm/window_manager_apptest.cc index 6e6e9fb..7ea0a25 100644 --- a/mash/wm/window_manager_apptest.cc +++ b/mash/wm/window_manager_apptest.cc @@ -39,12 +39,12 @@ TEST_F(WindowManagerAppTest, OpenWindow) { WindowTreeDelegateImpl window_tree_delegate; // Bring up the the desktop_wm. - shell()->Connect("mojo:desktop_wm"); + connector()->Connect("mojo:desktop_wm"); // Connect to mus and create a new top level window. The request goes to // the |desktop_wm|, but is async. scoped_ptr<mus::WindowTreeConnection> connection( - mus::WindowTreeConnection::Create(&window_tree_delegate, shell())); + mus::WindowTreeConnection::Create(&window_tree_delegate, connector())); mus::Window* top_level_window = connection->NewTopLevelWindow(nullptr); ASSERT_TRUE(top_level_window); mus::Window* child_window = connection->NewWindow(); |