| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "sky/shell/shell.h" | 5 #include "sky/shell/shell.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "mojo/common/message_pump_mojo.h" | 9 #include "mojo/common/message_pump_mojo.h" |
| 10 #include "mojo/edk/embedder/embedder.h" | 10 #include "mojo/edk/embedder/embedder.h" |
| 11 #include "mojo/edk/embedder/simple_platform_support.h" | 11 #include "mojo/edk/embedder/simple_platform_support.h" |
| 12 #include "sky/shell/android/platform_service_provider.h" | 12 #include "sky/shell/platform_view.h" |
| 13 #include "sky/shell/android/platform_view.h" | |
| 14 #include "sky/shell/gpu/rasterizer.h" | 13 #include "sky/shell/gpu/rasterizer.h" |
| 15 #include "sky/shell/ui/engine.h" | 14 #include "sky/shell/ui/engine.h" |
| 16 | 15 |
| 17 namespace sky { | 16 namespace sky { |
| 18 namespace shell { | 17 namespace shell { |
| 19 namespace { | 18 namespace { |
| 20 | 19 |
| 21 static Shell* g_shell = nullptr; | 20 static Shell* g_shell = nullptr; |
| 22 | 21 |
| 23 scoped_ptr<base::MessagePump> CreateMessagePumpMojo() { | 22 scoped_ptr<base::MessagePump> CreateMessagePumpMojo() { |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 | 74 |
| 76 void Shell::InitView() { | 75 void Shell::InitView() { |
| 77 PlatformView::Config config; | 76 PlatformView::Config config; |
| 78 config.ui_task_runner = ui_thread_->message_loop()->task_runner(); | 77 config.ui_task_runner = ui_thread_->message_loop()->task_runner(); |
| 79 config.ui_delegate = engine_->GetWeakPtr(); | 78 config.ui_delegate = engine_->GetWeakPtr(); |
| 80 view_.reset(new PlatformView(config)); | 79 view_.reset(new PlatformView(config)); |
| 81 } | 80 } |
| 82 | 81 |
| 83 } // namespace shell | 82 } // namespace shell |
| 84 } // namespace sky | 83 } // namespace sky |
| OLD | NEW |