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 "mojo/shell/static_application_loader.h" | 5 #include "mojo/shell/static_application_loader.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
12 #include "base/task_runner.h" | 12 #include "base/task_runner.h" |
13 #include "base/thread_task_runner_handle.h" | 13 #include "base/thread_task_runner_handle.h" |
14 #include "base/threading/simple_thread.h" | 14 #include "base/threading/simple_thread.h" |
15 #include "mojo/public/cpp/bindings/interface_request.h" | 15 #include "mojo/public/cpp/bindings/interface_request.h" |
16 #include "mojo/shell/public/cpp/application_delegate.h" | |
17 #include "mojo/shell/public/cpp/application_runner.h" | 16 #include "mojo/shell/public/cpp/application_runner.h" |
| 17 #include "mojo/shell/public/cpp/shell_client.h" |
18 #include "mojo/shell/public/interfaces/application.mojom.h" | 18 #include "mojo/shell/public/interfaces/application.mojom.h" |
19 | 19 |
20 namespace mojo { | 20 namespace mojo { |
21 namespace shell { | 21 namespace shell { |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
25 class RunnerThread : public base::SimpleThread { | 25 class RunnerThread : public base::SimpleThread { |
26 public: | 26 public: |
27 RunnerThread(const GURL& url, | 27 RunnerThread(const GURL& url, |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 | 89 |
90 void StaticApplicationLoader::StopAppThread() { | 90 void StaticApplicationLoader::StopAppThread() { |
91 thread_->Join(); | 91 thread_->Join(); |
92 thread_.reset(); | 92 thread_.reset(); |
93 if (!quit_callback_.is_null()) | 93 if (!quit_callback_.is_null()) |
94 quit_callback_.Run(); | 94 quit_callback_.Run(); |
95 } | 95 } |
96 | 96 |
97 } // namespace shell | 97 } // namespace shell |
98 } // namespace mojo | 98 } // namespace mojo |
OLD | NEW |