OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/memory/scoped_vector.h" | 6 #include "base/memory/scoped_vector.h" |
7 #include "mojo/public/cpp/application/application_delegate.h" | 7 #include "mojo/public/cpp/application/application_delegate.h" |
8 #include "mojo/public/cpp/application/application_impl.h" | 8 #include "mojo/public/cpp/application/application_impl.h" |
9 #include "mojo/service_manager/service_manager.h" | 9 #include "mojo/service_manager/service_manager.h" |
10 #include "mojo/services/public/cpp/view_manager/node.h" | 10 #include "mojo/services/public/cpp/view_manager/node.h" |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 | 270 |
271 shell::ShellTestHelper test_helper_; | 271 shell::ShellTestHelper test_helper_; |
272 base::MessageLoop loop_; | 272 base::MessageLoop loop_; |
273 ViewManagerInitServicePtr view_manager_init_; | 273 ViewManagerInitServicePtr view_manager_init_; |
274 scoped_ptr<TestWindowManagerClient> window_manager_client_; | 274 scoped_ptr<TestWindowManagerClient> window_manager_client_; |
275 TestServiceLoader::RootAddedCallback root_added_callback_; | 275 TestServiceLoader::RootAddedCallback root_added_callback_; |
276 | 276 |
277 DISALLOW_COPY_AND_ASSIGN(WindowManagerApiTest); | 277 DISALLOW_COPY_AND_ASSIGN(WindowManagerApiTest); |
278 }; | 278 }; |
279 | 279 |
280 // http://crbug.com/396295 | 280 TEST_F(WindowManagerApiTest, OpenWindow) { |
281 TEST_F(WindowManagerApiTest, DISABLED_OpenWindow) { | |
282 OpenWindow(window_manager_.get()); | 281 OpenWindow(window_manager_.get()); |
283 Id created_node = | 282 Id created_node = |
284 OpenWindowWithURL(window_manager_.get(), kTestServiceURL); | 283 OpenWindowWithURL(window_manager_.get(), kTestServiceURL); |
285 Id embed_node = WaitForEmbed(); | 284 Id embed_node = WaitForEmbed(); |
286 EXPECT_EQ(created_node, embed_node); | 285 EXPECT_EQ(created_node, embed_node); |
287 } | 286 } |
288 | 287 |
289 // http://crbug.com/396295 | 288 TEST_F(WindowManagerApiTest, FocusAndActivateWindow) { |
290 TEST_F(WindowManagerApiTest, DISABLED_FocusAndActivateWindow) { | |
291 Id first_window = OpenWindow(window_manager_.get()); | 289 Id first_window = OpenWindow(window_manager_.get()); |
292 window_manager_->FocusWindow(first_window, | 290 window_manager_->FocusWindow(first_window, |
293 base::Bind(&EmptyResultCallback)); | 291 base::Bind(&EmptyResultCallback)); |
294 TwoIds ids = WaitForFocusChange(); | 292 TwoIds ids = WaitForFocusChange(); |
295 EXPECT_TRUE(ids.first == 0); | 293 EXPECT_TRUE(ids.first == 0); |
296 EXPECT_EQ(ids.second, first_window); | 294 EXPECT_EQ(ids.second, first_window); |
297 | 295 |
298 Id second_window = OpenWindow(window_manager_.get()); | 296 Id second_window = OpenWindow(window_manager_.get()); |
299 window_manager_->ActivateWindow(second_window, | 297 window_manager_->ActivateWindow(second_window, |
300 base::Bind(&EmptyResultCallback)); | 298 base::Bind(&EmptyResultCallback)); |
301 ids = WaitForActiveWindowChange(); | 299 ids = WaitForActiveWindowChange(); |
302 EXPECT_EQ(ids.first, first_window); | 300 EXPECT_EQ(ids.first, first_window); |
303 EXPECT_EQ(ids.second, second_window); | 301 EXPECT_EQ(ids.second, second_window); |
304 } | 302 } |
305 | 303 |
306 } // namespace mojo | 304 } // namespace mojo |
OLD | NEW |