Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: services/shell/runner/host/native_application_support.cc

Issue 2397353002: Purge references of "Mojo Application" from comments & var names. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: services/shell/runner/host/native_application_support.cc
diff --git a/services/shell/runner/host/native_application_support.cc b/services/shell/runner/host/native_application_support.cc
deleted file mode 100644
index 829adf13c0e0a34a49a99fab2e05e335168aa987..0000000000000000000000000000000000000000
--- a/services/shell/runner/host/native_application_support.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "services/shell/runner/host/native_application_support.h"
-
-#include <stddef.h>
-
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/files/file_util.h"
-#include "base/logging.h"
-#include "mojo/edk/embedder/entrypoints.h"
-#include "mojo/public/c/system/thunks.h"
-
-namespace shell {
-
-namespace {
-
-template <typename Thunks>
-bool SetThunks(Thunks (*make_thunks)(),
- const char* function_name,
- base::NativeLibrary library) {
- typedef size_t (*SetThunksFn)(const Thunks* thunks);
- SetThunksFn set_thunks = reinterpret_cast<SetThunksFn>(
- base::GetFunctionPointerFromNativeLibrary(library, function_name));
- if (!set_thunks)
- return false;
- Thunks thunks = make_thunks();
- size_t expected_size = set_thunks(&thunks);
- if (expected_size > sizeof(Thunks)) {
- LOG(ERROR) << "Invalid app library: expected " << function_name
- << " to return thunks of size: " << expected_size;
- return false;
- }
- return true;
-}
-
-} // namespace
-
-base::NativeLibrary LoadNativeApplication(const base::FilePath& app_path) {
- DVLOG(2) << "Loading Mojo app in process from library: " << app_path.value();
-
- base::NativeLibraryLoadError error;
- base::NativeLibrary app_library = base::LoadNativeLibrary(app_path, &error);
- LOG_IF(ERROR, !app_library)
- << "Failed to load app library (path: " << app_path.value()
- << " reason: " << error.ToString() << ")";
- return app_library;
-}
-
-bool RunNativeApplication(base::NativeLibrary app_library,
- mojom::ServiceRequest request) {
- // Tolerate |app_library| being null, to make life easier for callers.
- if (!app_library)
- return false;
-
-// Thunks aren't needed/used in component build, since the thunked methods
-// just live in their own dynamically loaded library.
-#if !defined(COMPONENT_BUILD)
- if (!SetThunks(&mojo::edk::MakeSystemThunks, "MojoSetSystemThunks",
- app_library)) {
- LOG(ERROR) << "MojoSetSystemThunks not found";
- return false;
- }
-
-#if !defined(OS_WIN)
- // On Windows, initializing base::CommandLine with null parameters gets the
- // process's command line from the OS. Other platforms need it to be passed
- // in. This needs to be passed in before the app initializes the command line,
- // which is done as soon as it loads.
- typedef void (*InitCommandLineArgs)(int, const char* const*);
- InitCommandLineArgs init_command_line_args =
- reinterpret_cast<InitCommandLineArgs>(
- base::GetFunctionPointerFromNativeLibrary(app_library,
- "InitCommandLineArgs"));
- if (init_command_line_args) {
- int argc = 0;
- base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
- const char** argv = new const char*[cmd_line->argv().size()];
- for (auto& arg : cmd_line->argv())
- argv[argc++] = arg.c_str();
- init_command_line_args(argc, argv);
- }
-#endif
-
-#endif // !defined(COMPONENT_BUILD)
-
- typedef MojoResult (*ServiceMainFunction)(MojoHandle);
- ServiceMainFunction main_function = reinterpret_cast<ServiceMainFunction>(
- base::GetFunctionPointerFromNativeLibrary(app_library, "ServiceMain"));
- if (!main_function) {
- LOG(ERROR) << "ServiceMain not found";
- return false;
- }
- // |ServiceMain()| takes ownership of the service handle.
- MojoHandle handle = request.PassMessagePipe().release().value();
- MojoResult result = main_function(handle);
- if (result != MOJO_RESULT_OK) {
- LOG(ERROR) << "ServiceMain returned error (result: " << result << ")";
- }
- return true;
-}
-
-} // namespace shell
« no previous file with comments | « services/shell/runner/host/native_application_support.h ('k') | services/shell/runner/host/native_library_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698