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

Unified Diff: mandoline/app/desktop/launcher_process.cc

Issue 1440053002: Remove duplication between Mandoline and mojo_runner main functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « mandoline/app/desktop/launcher_process.h ('k') | mandoline/app/desktop/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/app/desktop/launcher_process.cc
diff --git a/mandoline/app/desktop/launcher_process.cc b/mandoline/app/desktop/launcher_process.cc
deleted file mode 100644
index 5a94a3200c8ee29d9ae4bb3f26d065fac83e54ff..0000000000000000000000000000000000000000
--- a/mandoline/app/desktop/launcher_process.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015 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 <stdio.h>
-#include <string.h>
-
-#include <algorithm>
-#include <iostream>
-
-#include "base/base_switches.h"
-#include "base/bind.h"
-#include "base/command_line.h"
-#include "base/files/file_util.h"
-#include "base/message_loop/message_loop.h"
-#include "base/path_service.h"
-#include "base/synchronization/waitable_event.h"
-#include "base/trace_event/trace_event.h"
-#include "components/tracing/trace_config_file.h"
-#include "components/tracing/tracing_switches.h"
-#include "mandoline/app/desktop/launcher_process.h"
-#include "mojo/runner/context.h"
-#include "mojo/runner/switches.h"
-#include "mojo/shell/switches.h"
-
-namespace mandoline {
-
-int LauncherProcessMain(int argc, char** argv) {
- mojo::runner::Tracer tracer;
- base::CommandLine* command_line =
- base::CommandLine::ForCurrentProcess();
- if (!command_line->HasSwitch(switches::kMojoSingleProcess))
- command_line->AppendSwitch(switches::kEnableMultiprocess);
- command_line->AppendSwitch("use-new-edk");
- // http://crbug.com/546644
- command_line->AppendSwitch(switches::kMojoNoSandbox);
-
- bool trace_startup = command_line->HasSwitch(switches::kTraceStartup);
- if (trace_startup) {
- tracer.Start(
- command_line->GetSwitchValueASCII(switches::kTraceStartup),
- command_line->GetSwitchValueASCII(switches::kTraceStartupDuration),
- "mandoline.trace");
- }
-
- // We want the runner::Context to outlive the MessageLoop so that pipes are
- // all gracefully closed / error-out before we try to shut the Context down.
- mojo::runner::Context shell_context;
- {
- base::MessageLoop message_loop;
- base::FilePath shell_dir;
- PathService::Get(base::DIR_MODULE, &shell_dir);
- if (!shell_context.Init(shell_dir)) {
- return 0;
- }
-
- message_loop.PostTask(FROM_HERE,
- base::Bind(&mojo::runner::Context::Run,
- base::Unretained(&shell_context),
- GURL("mojo:desktop_ui")));
- message_loop.Run();
-
- // Must be called before |message_loop| is destroyed.
- shell_context.Shutdown();
- }
-
- return 0;
-}
-
-} // namespace mandoline
« no previous file with comments | « mandoline/app/desktop/launcher_process.h ('k') | mandoline/app/desktop/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698