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

Unified Diff: mash/wm/window_manager_apptest.cc

Issue 1456233002: Converts remaining windowmanager property based functions to SetProperty (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « mash/wm/window_manager_application.cc ('k') | mash/wm/window_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager_apptest.cc
diff --git a/mash/wm/window_manager_apptest.cc b/mash/wm/window_manager_apptest.cc
index fad6d6878aa28fb69b002fcb3875e0fa4e375c2e..37f33f20668d441b6ce4b4d1a8679b61f228ed21 100644
--- a/mash/wm/window_manager_apptest.cc
+++ b/mash/wm/window_manager_apptest.cc
@@ -44,33 +44,9 @@ class WindowManagerAppTest : public mojo::test::ApplicationTestBase,
DISALLOW_COPY_AND_ASSIGN(WindowManagerAppTest);
};
-TEST_F(WindowManagerAppTest, SetPreferredSize) {
- // TODO(beng): right now this only verifies that requests from other
- // connections are blocked. We need to be able to reliably
- // configure the size of the window manager's display before we
- // can properly validate that centering actually happened.
- mus::mojom::WindowManagerPtr connection1, connection2;
- ConnectToWindowManager(&connection1);
- ConnectToWindowManager(&connection2);
+TEST_F(WindowManagerAppTest, OpenWindow) {
+ mus::mojom::WindowManagerPtr connection;
+ ConnectToWindowManager(&connection);
- mus::Window* window_from_connection1 = OpenWindow(connection1.get());
- mus::Window* window_from_connection2 = OpenWindow(connection2.get());
-
- bool succeeded = false;
- connection1->SetPreferredSize(
- window_from_connection1->id(), mojo::Size::New(),
- [&succeeded](mus::mojom::WindowManagerErrorCode result) {
- succeeded = result == mus::mojom::WINDOW_MANAGER_ERROR_CODE_SUCCESS;
- });
- ASSERT_TRUE(connection1.WaitForIncomingResponse());
- EXPECT_TRUE(succeeded);
-
- succeeded = false;
- connection1->SetPreferredSize(
- window_from_connection2->id(), mojo::Size::New(),
- [&succeeded](mus::mojom::WindowManagerErrorCode result) {
- succeeded = result == mus::mojom::WINDOW_MANAGER_ERROR_CODE_SUCCESS;
- });
- ASSERT_TRUE(connection1.WaitForIncomingResponse());
- EXPECT_FALSE(succeeded);
+ ASSERT_TRUE(OpenWindow(connection.get()));
}
« no previous file with comments | « mash/wm/window_manager_application.cc ('k') | mash/wm/window_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698