| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 <memory> | 5 #include <memory> |
| 6 | 6 |
| 7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/i18n/icu_util.h" | 10 #include "base/i18n/icu_util.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 #endif | 90 #endif |
| 91 ui::InitializeInputMethodForTesting(); | 91 ui::InitializeInputMethodForTesting(); |
| 92 ui::MaterialDesignController::Initialize(); | 92 ui::MaterialDesignController::Initialize(); |
| 93 | 93 |
| 94 { | 94 { |
| 95 views::DesktopTestViewsDelegate views_delegate; | 95 views::DesktopTestViewsDelegate views_delegate; |
| 96 #if defined(USE_AURA) | 96 #if defined(USE_AURA) |
| 97 wm::WMState wm_state; | 97 wm::WMState wm_state; |
| 98 #endif | 98 #endif |
| 99 #if !defined(OS_CHROMEOS) && defined(USE_AURA) | 99 #if !defined(OS_CHROMEOS) && defined(USE_AURA) |
| 100 std::unique_ptr<gfx::Screen> desktop_screen(views::CreateDesktopScreen()); | 100 std::unique_ptr<display::Screen> desktop_screen( |
| 101 views::CreateDesktopScreen()); |
| 101 display::Screen::SetScreenInstance(desktop_screen.get()); | 102 display::Screen::SetScreenInstance(desktop_screen.get()); |
| 102 #endif | 103 #endif |
| 103 | 104 |
| 104 views::examples::ShowExamplesWindow( | 105 views::examples::ShowExamplesWindow( |
| 105 views::examples::QUIT_ON_CLOSE, nullptr, | 106 views::examples::QUIT_ON_CLOSE, nullptr, |
| 106 std::unique_ptr<ScopedVector<views::examples::ExampleBase>>()); | 107 std::unique_ptr<ScopedVector<views::examples::ExampleBase>>()); |
| 107 | 108 |
| 108 base::RunLoop().Run(); | 109 base::RunLoop().Run(); |
| 109 | 110 |
| 110 ui::ResourceBundle::CleanupSharedInstance(); | 111 ui::ResourceBundle::CleanupSharedInstance(); |
| 111 } | 112 } |
| 112 | 113 |
| 113 ui::ShutdownInputMethod(); | 114 ui::ShutdownInputMethod(); |
| 114 | 115 |
| 115 #if defined(USE_AURA) | 116 #if defined(USE_AURA) |
| 116 env.reset(); | 117 env.reset(); |
| 117 #endif | 118 #endif |
| 118 | 119 |
| 119 return 0; | 120 return 0; |
| 120 } | 121 } |
| OLD | NEW |