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

Unified Diff: third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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
Index: third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc
diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc b/third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc
deleted file mode 100644
index d80b3959175802b4ba16068c51f5e64aa2e8f764..0000000000000000000000000000000000000000
--- a/third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc
+++ /dev/null
@@ -1,93 +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 "third_party/mojo/src/mojo/public/cpp/environment/environment.h"
-
-#include <assert.h>
-
-#include "third_party/mojo/src/mojo/public/c/environment/logger.h"
-#include "third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.h"
-#include "third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.h"
-#include "third_party/mojo/src/mojo/public/cpp/environment/lib/default_task_tracker.h"
-#include "third_party/mojo/src/mojo/public/cpp/utility/run_loop.h"
-
-namespace mojo {
-
-namespace {
-
-const MojoAsyncWaiter* g_default_async_waiter = nullptr;
-const MojoLogger* g_default_logger = nullptr;
-const TaskTracker* g_default_task_tracker = nullptr;
-
-void Init(const MojoAsyncWaiter* default_async_waiter,
- const MojoLogger* default_logger,
- const TaskTracker* default_task_tracker) {
- g_default_async_waiter = default_async_waiter
- ? default_async_waiter
- : &internal::kDefaultAsyncWaiter;
- g_default_logger =
- default_logger ? default_logger : &internal::kDefaultLogger;
-
- g_default_task_tracker = default_task_tracker
- ? default_task_tracker
- : &internal::kDefaultTaskTracker;
-
- RunLoop::SetUp();
-}
-
-} // namespace
-
-Environment::Environment() {
- Init(nullptr, nullptr, nullptr);
-}
-
-Environment::Environment(const MojoAsyncWaiter* default_async_waiter,
- const MojoLogger* default_logger,
- const TaskTracker* default_task_tracker) {
- Init(default_async_waiter, default_logger, default_task_tracker);
-}
-
-Environment::~Environment() {
- RunLoop::TearDown();
-
- // TODO(vtl): Maybe we should allow nesting, and restore previous default
- // async waiters and loggers?
- g_default_async_waiter = nullptr;
- g_default_logger = nullptr;
-}
-
-// static
-const MojoAsyncWaiter* Environment::GetDefaultAsyncWaiter() {
- assert(g_default_async_waiter); // Fails if not "inside" |Environment|.
- return g_default_async_waiter;
-}
-
-// static
-const MojoLogger* Environment::GetDefaultLogger() {
- assert(g_default_logger); // Fails if not "inside" |Environment|.
- return g_default_logger;
-}
-
-// static
-const TaskTracker* Environment::GetDefaultTaskTracker() {
- return g_default_task_tracker;
-}
-
-// static
-void Environment::InstantiateDefaultRunLoop() {
- assert(!RunLoop::current());
- // Not leaked: accessible from |RunLoop::current()|.
- RunLoop* run_loop = new RunLoop();
- MOJO_ALLOW_UNUSED_LOCAL(run_loop);
- assert(run_loop == RunLoop::current());
-}
-
-// static
-void Environment::DestroyDefaultRunLoop() {
- assert(RunLoop::current());
- delete RunLoop::current();
- assert(!RunLoop::current());
-}
-
-} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698