| 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 <string> | 5 #include <string> |
| 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/memory/ptr_util.h" |
| 10 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 11 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
| 12 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
| 13 #include "base/threading/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
| 14 #include "blimp/client/app/blimp_startup.h" | 15 #include "blimp/client/app/blimp_startup.h" |
| 15 #include "blimp/client/app/linux/blimp_client_context_delegate_linux.h" | 16 #include "blimp/client/app/linux/blimp_client_context_delegate_linux.h" |
| 16 #include "blimp/client/app/linux/blimp_display_manager.h" | 17 #include "blimp/client/app/linux/blimp_display_manager.h" |
| 17 #include "blimp/client/app/linux/blimp_display_manager_delegate_main.h" | 18 #include "blimp/client/app/linux/blimp_display_manager_delegate_main.h" |
| 18 #include "blimp/client/public/blimp_client_context.h" | 19 #include "blimp/client/public/blimp_client_context.h" |
| 19 #include "blimp/client/public/contents/blimp_navigation_controller.h" | 20 #include "blimp/client/public/contents/blimp_navigation_controller.h" |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 std::unique_ptr<blimp::client::BlimpDisplayManagerDelegate> | 164 std::unique_ptr<blimp::client::BlimpDisplayManagerDelegate> |
| 164 display_manager_delegate = | 165 display_manager_delegate = |
| 165 base::MakeUnique<blimp::client::BlimpDisplayManagerDelegateMain>(); | 166 base::MakeUnique<blimp::client::BlimpDisplayManagerDelegateMain>(); |
| 166 blimp::client::BlimpDisplayManager display_manager( | 167 blimp::client::BlimpDisplayManager display_manager( |
| 167 display_manager_delegate.get(), compositor_dependencies); | 168 display_manager_delegate.get(), compositor_dependencies); |
| 168 display_manager.SetWindowSize(gfx::Size(kWindowWidth, kWindowHeight)); | 169 display_manager.SetWindowSize(gfx::Size(kWindowWidth, kWindowHeight)); |
| 169 display_manager.SetBlimpContents(std::move(contents)); | 170 display_manager.SetBlimpContents(std::move(contents)); |
| 170 | 171 |
| 171 base::RunLoop().Run(); | 172 base::RunLoop().Run(); |
| 172 } | 173 } |
| OLD | NEW |