| Index: athena/input/input_manager_impl.cc
|
| diff --git a/athena/input/input_manager_impl.cc b/athena/input/input_manager_impl.cc
|
| index 0815a7a7cdd4229d157d189bdeb2cf06cd6dfed4..bd901b86641e546390a720f090ebafb32f07e86e 100644
|
| --- a/athena/input/input_manager_impl.cc
|
| +++ b/athena/input/input_manager_impl.cc
|
| @@ -12,7 +12,7 @@
|
| namespace athena {
|
| namespace {
|
|
|
| -InputManager* instance = NULL;
|
| +InputManager* instance = nullptr;
|
|
|
| } // namespace
|
|
|
| @@ -27,7 +27,7 @@ InputManagerImpl::InputManagerImpl()
|
| InputManagerImpl::~InputManagerImpl() {
|
| DCHECK_EQ(instance, this);
|
| Shutdown();
|
| - instance = NULL;
|
| + instance = nullptr;
|
| }
|
|
|
| void InputManagerImpl::Init() {
|
| @@ -83,7 +83,7 @@ scoped_ptr<ui::EventTargetIterator> InputManagerImpl::GetChildIterator() const {
|
|
|
| ui::EventTargeter* InputManagerImpl::GetEventTargeter() {
|
| NOTREACHED();
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| void InputManagerImpl::OnEvent(ui::Event* event) {
|
|
|