| 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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/i18n/icu_util.h" | 8 #include "base/i18n/icu_util.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| 11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
| 12 #include "ui/aura/env.h" | 12 #include "ui/aura/env.h" |
| 13 #include "ui/base/ime/input_method_initializer.h" | 13 #include "ui/base/ime/input_method_initializer.h" |
| 14 #include "ui/base/resource/resource_bundle.h" | 14 #include "ui/base/resource/resource_bundle.h" |
| 15 #include "ui/compositor/test/context_factories_for_test.h" | 15 #include "ui/compositor/test/context_factories_for_test.h" |
| 16 #include "ui/gfx/screen.h" | 16 #include "ui/gfx/screen.h" |
| 17 #include "ui/gl/gl_surface.h" |
| 17 #include "ui/views/corewm/wm_state.h" | 18 #include "ui/views/corewm/wm_state.h" |
| 18 #include "ui/views/examples/example_base.h" | 19 #include "ui/views/examples/example_base.h" |
| 19 #include "ui/views/examples/examples_window.h" | 20 #include "ui/views/examples/examples_window.h" |
| 20 #include "ui/views/test/desktop_test_views_delegate.h" | 21 #include "ui/views/test/desktop_test_views_delegate.h" |
| 21 | 22 |
| 22 #if !defined(OS_CHROMEOS) | 23 #if !defined(OS_CHROMEOS) |
| 23 #include "ui/views/widget/desktop_aura/desktop_screen.h" | 24 #include "ui/views/widget/desktop_aura/desktop_screen.h" |
| 24 #endif | 25 #endif |
| 25 #if defined(OS_WIN) | 26 #if defined(OS_WIN) |
| 26 #include "ui/base/win/scoped_ole_initializer.h" | 27 #include "ui/base/win/scoped_ole_initializer.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 39 base::i18n::InitializeICU(); | 40 base::i18n::InitializeICU(); |
| 40 | 41 |
| 41 base::FilePath pak_dir; | 42 base::FilePath pak_dir; |
| 42 PathService::Get(base::DIR_MODULE, &pak_dir); | 43 PathService::Get(base::DIR_MODULE, &pak_dir); |
| 43 | 44 |
| 44 base::FilePath pak_file; | 45 base::FilePath pak_file; |
| 45 pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak")); | 46 pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak")); |
| 46 | 47 |
| 47 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); | 48 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); |
| 48 | 49 |
| 50 gfx::GLSurface::InitializeOneOff(); |
| 51 |
| 49 // The ContextFactory must exist before any Compositors are created. | 52 // The ContextFactory must exist before any Compositors are created. |
| 50 bool allow_test_contexts = false; | 53 bool allow_test_contexts = false; |
| 51 ui::InitializeContextFactoryForTests(allow_test_contexts); | 54 ui::InitializeContextFactoryForTests(allow_test_contexts); |
| 52 | 55 |
| 53 aura::Env::CreateInstance(); | 56 aura::Env::CreateInstance(); |
| 54 | 57 |
| 55 ui::InitializeInputMethodForTesting(); | 58 ui::InitializeInputMethodForTesting(); |
| 56 | 59 |
| 57 { | 60 { |
| 58 views::DesktopTestViewsDelegate views_delegate; | 61 views::DesktopTestViewsDelegate views_delegate; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 73 | 76 |
| 74 ui::ResourceBundle::CleanupSharedInstance(); | 77 ui::ResourceBundle::CleanupSharedInstance(); |
| 75 } | 78 } |
| 76 | 79 |
| 77 ui::ShutdownInputMethod(); | 80 ui::ShutdownInputMethod(); |
| 78 | 81 |
| 79 aura::Env::DeleteInstance(); | 82 aura::Env::DeleteInstance(); |
| 80 | 83 |
| 81 return 0; | 84 return 0; |
| 82 } | 85 } |
| OLD | NEW |