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 "mojo/services/public/cpp/view_manager/view_manager.h" | 5 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "mojo/public/cpp/application/application.h" | 10 #include "mojo/public/cpp/application/application.h" |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 test_helper_.SetLoaderForURL( | 338 test_helper_.SetLoaderForURL( |
339 scoped_ptr<ServiceLoader>(new ConnectServiceLoader(ready_callback)), | 339 scoped_ptr<ServiceLoader>(new ConnectServiceLoader(ready_callback)), |
340 GURL(kWindowManagerURL)); | 340 GURL(kWindowManagerURL)); |
341 test_helper_.SetLoaderForURL( | 341 test_helper_.SetLoaderForURL( |
342 scoped_ptr<ServiceLoader>(new ConnectServiceLoader(ready_callback)), | 342 scoped_ptr<ServiceLoader>(new ConnectServiceLoader(ready_callback)), |
343 GURL(kEmbeddedApp1URL)); | 343 GURL(kEmbeddedApp1URL)); |
344 | 344 |
345 ConnectToService(test_helper_.service_provider(), | 345 ConnectToService(test_helper_.service_provider(), |
346 "mojo:mojo_view_manager", | 346 "mojo:mojo_view_manager", |
347 &view_manager_init_); | 347 &view_manager_init_); |
348 ASSERT_TRUE(ViewManagerInitConnect(view_manager_init_.get(), | 348 ASSERT_TRUE(EmbedRoot(view_manager_init_.get(), kWindowManagerURL)); |
349 kWindowManagerURL)); | |
350 } | 349 } |
351 | 350 |
352 void ViewManagerInitConnectCallback(bool* result_cache, | 351 void EmbedRootCallback(bool* result_cache, bool result) { |
353 bool result) { | |
354 *result_cache = result; | 352 *result_cache = result; |
355 } | 353 } |
356 | 354 |
357 bool ViewManagerInitConnect(IViewManagerInit* view_manager_init, | 355 bool EmbedRoot(IViewManagerInit* view_manager_init, const std::string& url) { |
358 const std::string& url) { | |
359 bool result = false; | 356 bool result = false; |
360 view_manager_init->Connect( | 357 view_manager_init->EmbedRoot( |
361 url, | 358 url, |
362 base::Bind(&ViewManagerTest::ViewManagerInitConnectCallback, | 359 base::Bind(&ViewManagerTest::EmbedRootCallback, base::Unretained(this), |
363 base::Unretained(this), &result)); | 360 &result)); |
364 RunRunLoop(); | 361 RunRunLoop(); |
365 window_manager_ = GetLoadedViewManager(); | 362 window_manager_ = GetLoadedViewManager(); |
366 return result; | 363 return result; |
367 } | 364 } |
368 | 365 |
369 void OnViewManagerLoaded(ViewManager* view_manager, ViewTreeNode* root) { | 366 void OnViewManagerLoaded(ViewManager* view_manager, ViewTreeNode* root) { |
370 loaded_view_manager_ = view_manager; | 367 loaded_view_manager_ = view_manager; |
371 connect_loop_->Quit(); | 368 connect_loop_->Quit(); |
372 } | 369 } |
373 | 370 |
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
700 window_manager()->GetRoots().front()->AddChild(node1); | 697 window_manager()->GetRoots().front()->AddChild(node1); |
701 ViewTreeNode* node2 = ViewTreeNode::Create(window_manager()); | 698 ViewTreeNode* node2 = ViewTreeNode::Create(window_manager()); |
702 window_manager()->GetRoots().front()->AddChild(node2); | 699 window_manager()->GetRoots().front()->AddChild(node2); |
703 ViewManager* embedded1 = Embed(window_manager(), node1); | 700 ViewManager* embedded1 = Embed(window_manager(), node1); |
704 ViewManager* embedded2 = Embed(window_manager(), node2); | 701 ViewManager* embedded2 = Embed(window_manager(), node2); |
705 EXPECT_EQ(embedded1, embedded2); | 702 EXPECT_EQ(embedded1, embedded2); |
706 } | 703 } |
707 | 704 |
708 } // namespace view_manager | 705 } // namespace view_manager |
709 } // namespace mojo | 706 } // namespace mojo |
OLD | NEW |