| 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/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "mojo/public/cpp/application/application_delegate.h" | 8 #include "mojo/public/cpp/application/application_delegate.h" |
| 9 #include "mojo/public/cpp/application/application_impl.h" | 9 #include "mojo/public/cpp/application/application_impl.h" |
| 10 #include "mojo/public/cpp/application/application_test_base.h" | 10 #include "mojo/public/cpp/application/application_test_base.h" |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 | 338 |
| 339 scoped_ptr<ViewManagerClientImpl> client_impl_; | 339 scoped_ptr<ViewManagerClientImpl> client_impl_; |
| 340 scoped_ptr<base::RunLoop> run_loop_; | 340 scoped_ptr<base::RunLoop> run_loop_; |
| 341 | 341 |
| 342 DISALLOW_COPY_AND_ASSIGN(ViewManagerClientFactory); | 342 DISALLOW_COPY_AND_ASSIGN(ViewManagerClientFactory); |
| 343 }; | 343 }; |
| 344 | 344 |
| 345 class ViewManagerServiceAppTest : public test::ApplicationTestBase, | 345 class ViewManagerServiceAppTest : public test::ApplicationTestBase, |
| 346 public ApplicationDelegate { | 346 public ApplicationDelegate { |
| 347 public: | 347 public: |
| 348 ViewManagerServiceAppTest() : ApplicationTestBase(Array<String>()) {} | 348 ViewManagerServiceAppTest() {} |
| 349 ~ViewManagerServiceAppTest() override {} | 349 ~ViewManagerServiceAppTest() override {} |
| 350 | 350 |
| 351 protected: | 351 protected: |
| 352 // Returns the changes from the various connections. | 352 // Returns the changes from the various connections. |
| 353 std::vector<Change>* changes1() { return vm_client1_.tracker()->changes(); } | 353 std::vector<Change>* changes1() { return vm_client1_.tracker()->changes(); } |
| 354 std::vector<Change>* changes2() { return vm_client2_->tracker()->changes(); } | 354 std::vector<Change>* changes2() { return vm_client2_->tracker()->changes(); } |
| 355 std::vector<Change>* changes3() { return vm_client3_->tracker()->changes(); } | 355 std::vector<Change>* changes3() { return vm_client3_->tracker()->changes(); } |
| 356 | 356 |
| 357 // Various connections. |vm1()|, being the first connection, has special | 357 // Various connections. |vm1()|, being the first connection, has special |
| 358 // permissions (it's treated as the window manager). | 358 // permissions (it's treated as the window manager). |
| (...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1396 // that SetBounsdViews/AddView and the like don't result in messages to the | 1396 // that SetBounsdViews/AddView and the like don't result in messages to the |
| 1397 // originating connection. | 1397 // originating connection. |
| 1398 | 1398 |
| 1399 // TODO(sky): make sure coverage of what was | 1399 // TODO(sky): make sure coverage of what was |
| 1400 // ViewManagerTest.SecondEmbedRoot_InitService and | 1400 // ViewManagerTest.SecondEmbedRoot_InitService and |
| 1401 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager | 1401 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager |
| 1402 // tests. | 1402 // tests. |
| 1403 | 1403 |
| 1404 } // namespace service | 1404 } // namespace service |
| 1405 } // namespace mojo | 1405 } // namespace mojo |
| OLD | NEW |