| 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 "ash/test/ash_test_environment.h" | 5 #include "ash/test/ash_test_environment.h" |
| 6 | 6 |
| 7 #include "ash/test/ash_test_views_delegate.h" | 7 #include "ash/test/ash_test_views_delegate.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 DISALLOW_COPY_AND_ASSIGN(AshTestEnvironmentDefault); | 46 DISALLOW_COPY_AND_ASSIGN(AshTestEnvironmentDefault); |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 } // namespace | 49 } // namespace |
| 50 | 50 |
| 51 // static | 51 // static |
| 52 std::unique_ptr<AshTestEnvironment> AshTestEnvironment::Create() { | 52 std::unique_ptr<AshTestEnvironment> AshTestEnvironment::Create() { |
| 53 return base::MakeUnique<AshTestEnvironmentDefault>(); | 53 return base::MakeUnique<AshTestEnvironmentDefault>(); |
| 54 } | 54 } |
| 55 | 55 |
| 56 // static |
| 57 std::string AshTestEnvironment::Get100PercentResourceFileName() { |
| 58 return "ash_test_resources_100_percent.pak"; |
| 59 } |
| 60 |
| 56 } // namespace test | 61 } // namespace test |
| 57 } // namespace ash | 62 } // namespace ash |
| OLD | NEW |