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

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

Issue 1997473005: Remove requirement that mojo::Environment be instantiated. (Closed) Base URL: https://github.com/domokit/mojo.git@work797_no_utility_tls
Patch Set: rebased Created 4 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
Index: mojo/public/cpp/environment/lib/environment.cc
diff --git a/mojo/public/cpp/environment/lib/environment.cc b/mojo/public/cpp/environment/lib/environment.cc
index 822497030bc6fa64166b65761ef89a3f883a3167..c2545496eb8c58a82bf4561411b88e3e8bcffbf7 100644
--- a/mojo/public/cpp/environment/lib/environment.cc
+++ b/mojo/public/cpp/environment/lib/environment.cc
@@ -13,37 +13,8 @@
namespace mojo {
-namespace {
-
-const MojoAsyncWaiter* g_default_async_waiter = nullptr;
-const MojoLogger* g_default_logger = nullptr;
-
-void Init(const MojoAsyncWaiter* default_async_waiter,
- const MojoLogger* default_logger) {
- g_default_async_waiter = default_async_waiter
- ? default_async_waiter
- : &internal::kDefaultAsyncWaiter;
- g_default_logger =
- default_logger ? default_logger : &internal::kDefaultLogger;
-}
-
-} // namespace
-
-Environment::Environment() {
- Init(nullptr, nullptr);
-}
-
-Environment::Environment(const MojoAsyncWaiter* default_async_waiter,
- const MojoLogger* default_logger) {
- Init(default_async_waiter, default_logger);
-}
-
-Environment::~Environment() {
- // TODO(vtl): Maybe we should allow nesting, and restore previous default
- // async waiters and loggers?
- g_default_async_waiter = nullptr;
- g_default_logger = nullptr;
-}
+const MojoAsyncWaiter* g_default_async_waiter = &internal::kDefaultAsyncWaiter;
+const MojoLogger* g_default_logger = &internal::kDefaultLogger;
// static
const MojoAsyncWaiter* Environment::GetDefaultAsyncWaiter() {

Powered by Google App Engine
This is Rietveld 408576698