| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ui/views/test/platform_test_helper.h" | 5 #include "ui/views/test/platform_test_helper.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "mojo/shell/background/background_shell.h" | 9 #include "services/shell/background/background_shell.h" |
| 10 #include "mojo/shell/background/tests/test_catalog_store.h" | 10 #include "services/shell/background/tests/test_catalog_store.h" |
| 11 #include "mojo/shell/public/cpp/connector.h" | 11 #include "services/shell/public/cpp/connector.h" |
| 12 #include "mojo/shell/public/cpp/shell_client.h" | 12 #include "services/shell/public/cpp/shell_client.h" |
| 13 #include "mojo/shell/public/cpp/shell_connection.h" | 13 #include "services/shell/public/cpp/shell_connection.h" |
| 14 #include "ui/aura/env.h" | 14 #include "ui/aura/env.h" |
| 15 #include "ui/views/mus/window_manager_connection.h" | 15 #include "ui/views/mus/window_manager_connection.h" |
| 16 #include "ui/views/views_delegate.h" | 16 #include "ui/views/views_delegate.h" |
| 17 | 17 |
| 18 using mojo::shell::BackgroundShell; | 18 using mojo::shell::BackgroundShell; |
| 19 | 19 |
| 20 namespace views { | 20 namespace views { |
| 21 namespace { | 21 namespace { |
| 22 | 22 |
| 23 const char kTestName[] = "mojo:test-app"; | 23 const char kTestName[] = "mojo:test-app"; |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 }; | 100 }; |
| 101 | 101 |
| 102 } // namespace | 102 } // namespace |
| 103 | 103 |
| 104 // static | 104 // static |
| 105 scoped_ptr<PlatformTestHelper> PlatformTestHelper::Create() { | 105 scoped_ptr<PlatformTestHelper> PlatformTestHelper::Create() { |
| 106 return make_scoped_ptr(new PlatformTestHelperMus); | 106 return make_scoped_ptr(new PlatformTestHelperMus); |
| 107 } | 107 } |
| 108 | 108 |
| 109 } // namespace views | 109 } // namespace views |
| OLD | NEW |