| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "components/mus/public/cpp/window.h" | 6 #include "components/mus/public/cpp/window.h" |
| 7 #include "components/mus/public/cpp/window_tree_connection.h" | 7 #include "components/mus/public/cpp/window_tree_connection.h" |
| 8 #include "components/mus/public/cpp/window_tree_delegate.h" | 8 #include "components/mus/public/cpp/window_tree_delegate.h" |
| 9 #include "components/mus/public/interfaces/window_manager.mojom.h" | 9 #include "components/mus/public/interfaces/window_manager.mojom.h" |
| 10 #include "components/mus/public/interfaces/window_tree.mojom.h" | 10 #include "components/mus/public/interfaces/window_tree.mojom.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 } | 39 } |
| 40 | 40 |
| 41 private: | 41 private: |
| 42 // mus::WindowTreeDelegate: | 42 // mus::WindowTreeDelegate: |
| 43 void OnEmbed(mus::Window* root) override {} | 43 void OnEmbed(mus::Window* root) override {} |
| 44 void OnConnectionLost(mus::WindowTreeConnection* connection) override {} | 44 void OnConnectionLost(mus::WindowTreeConnection* connection) override {} |
| 45 | 45 |
| 46 DISALLOW_COPY_AND_ASSIGN(WindowManagerAppTest); | 46 DISALLOW_COPY_AND_ASSIGN(WindowManagerAppTest); |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 TEST_F(WindowManagerAppTest, OpenWindow) { | 49 // TODO(sky): flakey, http://crbug.com/559412 . |
| 50 TEST_F(WindowManagerAppTest, DISABLED_OpenWindow) { |
| 50 mus::mojom::WindowManagerPtr connection; | 51 mus::mojom::WindowManagerPtr connection; |
| 51 ConnectToWindowManager(&connection); | 52 ConnectToWindowManager(&connection); |
| 52 | 53 |
| 53 ASSERT_TRUE(OpenWindow(connection.get())); | 54 ASSERT_TRUE(OpenWindow(connection.get())); |
| 54 } | 55 } |
| 55 | 56 |
| 56 } // namespace wm | 57 } // namespace wm |
| 57 } // namespace mash | 58 } // namespace mash |
| OLD | NEW |