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/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 } // namespace | 42 } // namespace |
43 | 43 |
44 int main(int argc, const char**argv) { | 44 int main(int argc, const char**argv) { |
45 base::AtExitManager at_exit; | 45 base::AtExitManager at_exit; |
46 base::CommandLine::Init(argc, argv); | 46 base::CommandLine::Init(argc, argv); |
47 | 47 |
48 CHECK(gfx::InitializeThreadedX11()); | 48 CHECK(gfx::InitializeThreadedX11()); |
49 | 49 |
50 blimp::client::InitializeLogging(); | 50 blimp::client::InitializeLogging(); |
51 blimp::client::InitializeMainMessageLoop(); | 51 blimp::client::InitializeMainMessageLoop(); |
| 52 blimp::client::InitializeResourceBundle(); |
52 | 53 |
53 base::Thread io_thread("BlimpIOThread"); | 54 base::Thread io_thread("BlimpIOThread"); |
54 base::Thread::Options options; | 55 base::Thread::Options options; |
55 options.message_loop_type = base::MessageLoop::TYPE_IO; | 56 options.message_loop_type = base::MessageLoop::TYPE_IO; |
56 io_thread.StartWithOptions(options); | 57 io_thread.StartWithOptions(options); |
57 | 58 |
58 // Creating this using "new" and passing to context using "WrapUnique" as | 59 // Creating this using "new" and passing to context using "WrapUnique" as |
59 // opposed to "MakeUnique" because we'll need to pass the compositor | 60 // opposed to "MakeUnique" because we'll need to pass the compositor |
60 // dependencies to the display manager as well. | 61 // dependencies to the display manager as well. |
61 blimp::client::CompositorDependencies* compositor_dependencies = | 62 blimp::client::CompositorDependencies* compositor_dependencies = |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 std::unique_ptr<blimp::client::BlimpDisplayManagerDelegate> | 103 std::unique_ptr<blimp::client::BlimpDisplayManagerDelegate> |
103 display_manager_delegate = | 104 display_manager_delegate = |
104 base::MakeUnique<blimp::client::BlimpDisplayManagerDelegateMain>(); | 105 base::MakeUnique<blimp::client::BlimpDisplayManagerDelegateMain>(); |
105 blimp::client::BlimpDisplayManager display_manager( | 106 blimp::client::BlimpDisplayManager display_manager( |
106 display_manager_delegate.get(), compositor_dependencies); | 107 display_manager_delegate.get(), compositor_dependencies); |
107 display_manager.SetWindowSize(gfx::Size(kWindowWidth, kWindowHeight)); | 108 display_manager.SetWindowSize(gfx::Size(kWindowWidth, kWindowHeight)); |
108 display_manager.SetBlimpContents(std::move(contents)); | 109 display_manager.SetBlimpContents(std::move(contents)); |
109 | 110 |
110 base::RunLoop().Run(); | 111 base::RunLoop().Run(); |
111 } | 112 } |
OLD | NEW |