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

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

Issue 1426843004: Remove the task tracking stuff in the bindings. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 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: 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 8c7c930671d825cd7624899f72880548d72d4ae0..6fb7e22a2204ef57185897050d743391b5a1684a 100644
--- a/mojo/public/cpp/environment/lib/environment.cc
+++ b/mojo/public/cpp/environment/lib/environment.cc
@@ -9,7 +9,6 @@
#include "mojo/public/c/environment/logger.h"
#include "mojo/public/cpp/environment/lib/default_async_waiter.h"
#include "mojo/public/cpp/environment/lib/default_logger.h"
-#include "mojo/public/cpp/environment/lib/default_task_tracker.h"
#include "mojo/public/cpp/utility/run_loop.h"
namespace mojo {
@@ -18,34 +17,27 @@ 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) {
+ 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;
- g_default_task_tracker = default_task_tracker
- ? default_task_tracker
- : &internal::kDefaultTaskTracker;
-
RunLoop::SetUp();
}
} // namespace
Environment::Environment() {
- Init(nullptr, nullptr, nullptr);
+ Init(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);
+ const MojoLogger* default_logger) {
+ Init(default_async_waiter, default_logger);
}
Environment::~Environment() {
@@ -70,11 +62,6 @@ const MojoLogger* Environment::GetDefaultLogger() {
}
// static
-const TaskTracker* Environment::GetDefaultTaskTracker() {
- return g_default_task_tracker;
-}
-
-// static
void Environment::InstantiateDefaultRunLoop() {
assert(!RunLoop::current());
// Not leaked: accessible from |RunLoop::current()|.
« no previous file with comments | « mojo/public/cpp/environment/lib/default_task_tracker.cc ('k') | mojo/public/cpp/environment/lib/logging_only_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698