| 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 "mojo/shell/dynamic_service_loader.h" | 5 #include "mojo/shell/dynamic_service_loader.h" |
| 6 | 6 |
| 7 #include "base/callback_helpers.h" | 7 #include "base/callback_helpers.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/scoped_native_library.h" | 10 #include "base/scoped_native_library.h" |
| 11 #include "base/threading/simple_thread.h" | 11 #include "base/threading/simple_thread.h" |
| 12 #include "mojo/shell/context.h" | 12 #include "mojo/shell/context.h" |
| 13 #include "mojo/shell/keep_alive.h" | 13 #include "mojo/shell/keep_alive.h" |
| 14 #include "mojo/shell/switches.h" | 14 #include "mojo/shell/switches.h" |
| 15 #include "mojom/shell.h" | |
| 16 | 15 |
| 17 typedef MojoResult (*MojoMainFunction)(MojoHandle pipe); | 16 typedef MojoResult (*MojoMainFunction)(MojoHandle pipe); |
| 18 | 17 |
| 19 namespace mojo { | 18 namespace mojo { |
| 20 namespace shell { | 19 namespace shell { |
| 21 namespace { | 20 namespace { |
| 22 | 21 |
| 23 std::string MakeSharedLibraryName(const std::string& file_name) { | 22 std::string MakeSharedLibraryName(const std::string& file_name) { |
| 24 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
| 25 return file_name + ".dll"; | 24 return file_name + ".dll"; |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 DCHECK(it != url_to_load_context_.end()); | 141 DCHECK(it != url_to_load_context_.end()); |
| 143 | 142 |
| 144 LoadContext* doomed = it->second; | 143 LoadContext* doomed = it->second; |
| 145 url_to_load_context_.erase(it); | 144 url_to_load_context_.erase(it); |
| 146 | 145 |
| 147 delete doomed; | 146 delete doomed; |
| 148 } | 147 } |
| 149 | 148 |
| 150 } // namespace shell | 149 } // namespace shell |
| 151 } // namespace mojo | 150 } // namespace mojo |
| OLD | NEW |