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

Unified Diff: mojo/application/application_runner_chromium.cc

Issue 1142323003: Remove duplicate application cpp files in mojo/application. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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
« no previous file with comments | « mojo/application/application_runner_chromium.h ('k') | mojo/application/application_test_base_chromium.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/application/application_runner_chromium.cc
diff --git a/mojo/application/application_runner_chromium.cc b/mojo/application/application_runner_chromium.cc
deleted file mode 100644
index 35d945d42bd918bd7b092d18c7fd5900926c9043..0000000000000000000000000000000000000000
--- a/mojo/application/application_runner_chromium.cc
+++ /dev/null
@@ -1,84 +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 "mojo/application/application_runner_chromium.h"
-
-#include "base/at_exit.h"
-#include "base/command_line.h"
-#include "base/debug/stack_trace.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/common/message_pump_mojo.h"
-
-int g_argc;
-const char* const* g_argv;
-#if !defined(OS_WIN)
-extern "C" {
-__attribute__((visibility("default"))) void InitCommandLineArgs(
- int argc, const char* const* argv) {
- g_argc = argc;
- g_argv = argv;
-}
-}
-#endif
-
-namespace mojo {
-
-// static
-void ApplicationImpl::Terminate() {
- if (base::MessageLoop::current()->is_running())
- base::MessageLoop::current()->Quit();
-}
-
-ApplicationRunnerChromium::ApplicationRunnerChromium(
- ApplicationDelegate* delegate)
- : delegate_(scoped_ptr<ApplicationDelegate>(delegate)),
- message_loop_type_(base::MessageLoop::TYPE_CUSTOM),
- has_run_(false) {}
-
-ApplicationRunnerChromium::~ApplicationRunnerChromium() {}
-
-void ApplicationRunnerChromium::InitBaseCommandLine() {
- base::CommandLine::Init(g_argc, g_argv);
-}
-
-void ApplicationRunnerChromium::set_message_loop_type(
- base::MessageLoop::Type type) {
- DCHECK_NE(base::MessageLoop::TYPE_CUSTOM, type);
- DCHECK(!has_run_);
-
- message_loop_type_ = type;
-}
-
-MojoResult ApplicationRunnerChromium::Run(
- MojoHandle application_request_handle) {
- DCHECK(!has_run_);
- has_run_ = true;
-
- InitBaseCommandLine();
- base::AtExitManager at_exit;
-
-#ifndef NDEBUG
- base::debug::EnableInProcessStackDumping();
-#endif
-
- {
- scoped_ptr<base::MessageLoop> loop;
- if (message_loop_type_ == base::MessageLoop::TYPE_CUSTOM)
- loop.reset(new base::MessageLoop(common::MessagePumpMojo::Create()));
- else
- loop.reset(new base::MessageLoop(message_loop_type_));
-
- ApplicationImpl impl(delegate_.get(),
- MakeRequest<Application>(MakeScopedHandle(
- MessagePipeHandle(application_request_handle))));
- loop->Run();
- }
- delegate_.reset();
- return MOJO_RESULT_OK;
-}
-
-} // namespace mojo
« no previous file with comments | « mojo/application/application_runner_chromium.h ('k') | mojo/application/application_test_base_chromium.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698