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

Unified Diff: athena/input/input_manager_impl.cc

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 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
« no previous file with comments | « athena/input/accelerator_manager_impl.cc ('k') | athena/main/athena_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « athena/input/accelerator_manager_impl.cc ('k') | athena/main/athena_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698