| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 views::DesktopTestViewsDelegate views_delegate; | 105 views::DesktopTestViewsDelegate views_delegate; |
| 106 #if defined(USE_AURA) | 106 #if defined(USE_AURA) |
| 107 wm::WMState wm_state; | 107 wm::WMState wm_state; |
| 108 #endif | 108 #endif |
| 109 #if !defined(OS_CHROMEOS) && defined(USE_AURA) | 109 #if !defined(OS_CHROMEOS) && defined(USE_AURA) |
| 110 std::unique_ptr<display::Screen> desktop_screen( | 110 std::unique_ptr<display::Screen> desktop_screen( |
| 111 views::CreateDesktopScreen()); | 111 views::CreateDesktopScreen()); |
| 112 display::Screen::SetScreenInstance(desktop_screen.get()); | 112 display::Screen::SetScreenInstance(desktop_screen.get()); |
| 113 #endif | 113 #endif |
| 114 | 114 |
| 115 views::examples::ShowExamplesWindow( | 115 views::examples::ShowExamplesWindow(views::examples::QUIT_ON_CLOSE, nullptr, |
| 116 views::examples::QUIT_ON_CLOSE, nullptr, | 116 nullptr); |
| 117 std::unique_ptr<ScopedVector<views::examples::ExampleBase>>()); | |
| 118 | 117 |
| 119 base::RunLoop().Run(); | 118 base::RunLoop().Run(); |
| 120 | 119 |
| 121 ui::ResourceBundle::CleanupSharedInstance(); | 120 ui::ResourceBundle::CleanupSharedInstance(); |
| 122 } | 121 } |
| 123 | 122 |
| 124 ui::ShutdownInputMethod(); | 123 ui::ShutdownInputMethod(); |
| 125 | 124 |
| 126 #if defined(USE_AURA) | 125 #if defined(USE_AURA) |
| 127 env.reset(); | 126 env.reset(); |
| 128 #endif | 127 #endif |
| 129 | 128 |
| 130 return 0; | 129 return 0; |
| 131 } | 130 } |
| OLD | NEW |