| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/synchronization/waitable_event.h" | 9 #include "base/synchronization/waitable_event.h" |
| 10 #include "base/threading/platform_thread.h" | 10 #include "base/threading/platform_thread.h" |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 url, | 240 url, |
| 241 strict_, | 241 strict_, |
| 242 run_on_message_loop)); | 242 run_on_message_loop)); |
| 243 } | 243 } |
| 244 } | 244 } |
| 245 | 245 |
| 246 } // namespace dart | 246 } // namespace dart |
| 247 | 247 |
| 248 MojoResult MojoMain(MojoHandle application_request) { | 248 MojoResult MojoMain(MojoHandle application_request) { |
| 249 mojo::ApplicationRunnerChromium runner(new dart::DartContentHandlerApp); | 249 mojo::ApplicationRunnerChromium runner(new dart::DartContentHandlerApp); |
| 250 MojoResult r = runner.Run(application_request); | 250 return runner.Run(application_request); |
| 251 // TODO(johnmccutchan): Remove this once the Dart VM shuts down threads. | |
| 252 base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100)); | |
| 253 return r; | |
| 254 } | 251 } |
| OLD | NEW |