| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/public/cpp/environment/environment.h" | 5 #include "mojo/public/cpp/environment/environment.h" |
| 6 | 6 |
| 7 #include <assert.h> | 7 #include <assert.h> |
| 8 #include <stddef.h> | |
| 9 | 8 |
| 10 #include "mojo/public/c/environment/logger.h" | 9 #include "mojo/public/c/environment/logger.h" |
| 11 #include "mojo/public/cpp/environment/lib/default_async_waiter.h" | 10 #include "mojo/public/cpp/environment/lib/default_async_waiter.h" |
| 12 #include "mojo/public/cpp/environment/lib/default_logger.h" | 11 #include "mojo/public/cpp/environment/lib/default_logger.h" |
| 13 #include "mojo/public/cpp/utility/run_loop.h" | 12 #include "mojo/public/cpp/utility/run_loop.h" |
| 14 | 13 |
| 15 namespace mojo { | 14 namespace mojo { |
| 16 | 15 |
| 17 namespace { | 16 namespace { |
| 18 | 17 |
| 19 const MojoAsyncWaiter* g_default_async_waiter = NULL; | 18 const MojoAsyncWaiter* g_default_async_waiter = nullptr; |
| 20 const MojoLogger* g_default_logger = NULL; | 19 const MojoLogger* g_default_logger = nullptr; |
| 21 | 20 |
| 22 void Init(const MojoAsyncWaiter* default_async_waiter, | 21 void Init(const MojoAsyncWaiter* default_async_waiter, |
| 23 const MojoLogger* default_logger) { | 22 const MojoLogger* default_logger) { |
| 24 g_default_async_waiter = | 23 g_default_async_waiter = |
| 25 default_async_waiter ? default_async_waiter : | 24 default_async_waiter ? default_async_waiter : |
| 26 &internal::kDefaultAsyncWaiter; | 25 &internal::kDefaultAsyncWaiter; |
| 27 g_default_logger = default_logger ? default_logger : | 26 g_default_logger = default_logger ? default_logger : |
| 28 &internal::kDefaultLogger; | 27 &internal::kDefaultLogger; |
| 29 | 28 |
| 30 RunLoop::SetUp(); | 29 RunLoop::SetUp(); |
| 31 } | 30 } |
| 32 | 31 |
| 33 } // namespace | 32 } // namespace |
| 34 | 33 |
| 35 Environment::Environment() { | 34 Environment::Environment() { |
| 36 Init(NULL, NULL); | 35 Init(nullptr, nullptr); |
| 37 } | 36 } |
| 38 | 37 |
| 39 Environment::Environment(const MojoAsyncWaiter* default_async_waiter, | 38 Environment::Environment(const MojoAsyncWaiter* default_async_waiter, |
| 40 const MojoLogger* default_logger) { | 39 const MojoLogger* default_logger) { |
| 41 Init(default_async_waiter, default_logger); | 40 Init(default_async_waiter, default_logger); |
| 42 } | 41 } |
| 43 | 42 |
| 44 Environment::~Environment() { | 43 Environment::~Environment() { |
| 45 RunLoop::TearDown(); | 44 RunLoop::TearDown(); |
| 46 | 45 |
| 47 // TODO(vtl): Maybe we should allow nesting, and restore previous default | 46 // TODO(vtl): Maybe we should allow nesting, and restore previous default |
| 48 // async waiters and loggers? | 47 // async waiters and loggers? |
| 49 g_default_async_waiter = NULL; | 48 g_default_async_waiter = nullptr; |
| 50 g_default_logger = NULL; | 49 g_default_logger = nullptr; |
| 51 } | 50 } |
| 52 | 51 |
| 53 // static | 52 // static |
| 54 const MojoAsyncWaiter* Environment::GetDefaultAsyncWaiter() { | 53 const MojoAsyncWaiter* Environment::GetDefaultAsyncWaiter() { |
| 55 assert(g_default_async_waiter); // Fails if not "inside" |Environment|. | 54 assert(g_default_async_waiter); // Fails if not "inside" |Environment|. |
| 56 return g_default_async_waiter; | 55 return g_default_async_waiter; |
| 57 } | 56 } |
| 58 | 57 |
| 59 // static | 58 // static |
| 60 const MojoLogger* Environment::GetDefaultLogger() { | 59 const MojoLogger* Environment::GetDefaultLogger() { |
| 61 assert(g_default_logger); // Fails if not "inside" |Environment|. | 60 assert(g_default_logger); // Fails if not "inside" |Environment|. |
| 62 return g_default_logger; | 61 return g_default_logger; |
| 63 } | 62 } |
| 64 | 63 |
| 65 } // namespace mojo | 64 } // namespace mojo |
| OLD | NEW |