| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <utility> | 5 #include <utility> |
| 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/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 | 332 |
| 333 // Initialize logging so we can enable VLOG messages. | 333 // Initialize logging so we can enable VLOG messages. |
| 334 logging::LoggingSettings settings; | 334 logging::LoggingSettings settings; |
| 335 logging::InitLogging(settings); | 335 logging::InitLogging(settings); |
| 336 | 336 |
| 337 // Build UI thread message loop. This is used by platform | 337 // Build UI thread message loop. This is used by platform |
| 338 // implementations for event polling & running background tasks. | 338 // implementations for event polling & running background tasks. |
| 339 base::MessageLoopForUI message_loop; | 339 base::MessageLoopForUI message_loop; |
| 340 base::TaskScheduler::CreateAndSetSimpleTaskScheduler("OzoneDemo"); | 340 base::TaskScheduler::CreateAndSetSimpleTaskScheduler("OzoneDemo"); |
| 341 | 341 |
| 342 ui::OzonePlatform::InitializeForUI(); | 342 ui::OzonePlatform::InitParams params; |
| 343 ui::OzonePlatform::InitializeForUI(params); |
| 344 |
| 343 ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine() | 345 ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine() |
| 344 ->SetCurrentLayoutByName("us"); | 346 ->SetCurrentLayoutByName("us"); |
| 345 | 347 |
| 346 base::RunLoop run_loop; | 348 base::RunLoop run_loop; |
| 347 | 349 |
| 348 WindowManager window_manager(run_loop.QuitClosure()); | 350 WindowManager window_manager(run_loop.QuitClosure()); |
| 349 | 351 |
| 350 run_loop.Run(); | 352 run_loop.Run(); |
| 351 | 353 |
| 352 return 0; | 354 return 0; |
| 353 } | 355 } |
| OLD | NEW |