OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/runner/context.h" | 5 #include "mojo/runner/context.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 #include "url/gurl.h" | 47 #include "url/gurl.h" |
48 | 48 |
49 namespace mojo { | 49 namespace mojo { |
50 namespace runner { | 50 namespace runner { |
51 namespace { | 51 namespace { |
52 | 52 |
53 // Used to ensure we only init once. | 53 // Used to ensure we only init once. |
54 class Setup { | 54 class Setup { |
55 public: | 55 public: |
56 Setup() { | 56 Setup() { |
| 57 #if defined(OS_WIN) |
| 58 embedder::PreInitializeParentProcess(); |
| 59 #endif |
| 60 |
57 embedder::Init(); | 61 embedder::Init(); |
58 } | 62 } |
59 | 63 |
60 ~Setup() {} | 64 ~Setup() {} |
61 | 65 |
62 private: | 66 private: |
63 DISALLOW_COPY_AND_ASSIGN(Setup); | 67 DISALLOW_COPY_AND_ASSIGN(Setup); |
64 }; | 68 }; |
65 | 69 |
66 void InitContentHandlers(package_manager::PackageManagerImpl* manager, | 70 void InitContentHandlers(package_manager::PackageManagerImpl* manager, |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 base::MessageLoop::current()->QuitWhenIdle(); | 344 base::MessageLoop::current()->QuitWhenIdle(); |
341 } else { | 345 } else { |
342 app_complete_callback_.Run(); | 346 app_complete_callback_.Run(); |
343 } | 347 } |
344 } | 348 } |
345 } | 349 } |
346 } | 350 } |
347 | 351 |
348 } // namespace runner | 352 } // namespace runner |
349 } // namespace mojo | 353 } // namespace mojo |
OLD | NEW |