| 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 "shell/dynamic_service_runner.h" | 5 #include "shell/dynamic_service_runner.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h" | 10 #include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 << " to return thunks of size: " << expected_size; | 34 << " to return thunks of size: " << expected_size; |
| 35 return false; | 35 return false; |
| 36 } | 36 } |
| 37 return true; | 37 return true; |
| 38 } | 38 } |
| 39 | 39 |
| 40 } // namespace | 40 } // namespace |
| 41 | 41 |
| 42 base::NativeLibrary LoadAndRunNativeApplication( | 42 base::NativeLibrary LoadAndRunNativeApplication( |
| 43 const base::FilePath& app_path, | 43 const base::FilePath& app_path, |
| 44 mojo::NativeRunner::CleanupBehavior cleanup_behavior, | 44 NativeRunner::CleanupBehavior cleanup_behavior, |
| 45 InterfaceRequest<Application> application_request) { | 45 InterfaceRequest<Application> application_request) { |
| 46 DVLOG(2) << "Loading/running Mojo app in process from library: " | 46 DVLOG(2) << "Loading/running Mojo app in process from library: " |
| 47 << app_path.value(); | 47 << app_path.value(); |
| 48 base::NativeLibraryLoadError error; | 48 base::NativeLibraryLoadError error; |
| 49 base::NativeLibrary app_library = base::LoadNativeLibrary(app_path, &error); | 49 base::NativeLibrary app_library = base::LoadNativeLibrary(app_path, &error); |
| 50 if (cleanup_behavior == NativeRunner::DeleteAppPath) | 50 if (cleanup_behavior == NativeRunner::DeleteAppPath) |
| 51 DeleteFile(app_path, false); | 51 DeleteFile(app_path, false); |
| 52 do { | 52 do { |
| 53 if (!app_library) { | 53 if (!app_library) { |
| 54 LOG(ERROR) << "Failed to load app library (error: " << error.ToString() | 54 LOG(ERROR) << "Failed to load app library (error: " << error.ToString() |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 LOG(ERROR) << app_path.value() << " MojoMain returned error(" << result | 108 LOG(ERROR) << app_path.value() << " MojoMain returned error(" << result |
| 109 << ")"; | 109 << ")"; |
| 110 } | 110 } |
| 111 } while (false); | 111 } while (false); |
| 112 | 112 |
| 113 return app_library; | 113 return app_library; |
| 114 } | 114 } |
| 115 | 115 |
| 116 } // namespace shell | 116 } // namespace shell |
| 117 } // namespace mojo | 117 } // namespace mojo |
| OLD | NEW |