Index: athena/input/accelerator_manager_impl.cc |
diff --git a/athena/input/accelerator_manager_impl.cc b/athena/input/accelerator_manager_impl.cc |
index bd6fbe636adb16dcc3bf763bcc0da7b424708adc..3bb7e62a4f5616b4f64cacc8b301b8d5148bc7b7 100644 |
--- a/athena/input/accelerator_manager_impl.cc |
+++ b/athena/input/accelerator_manager_impl.cc |
@@ -102,7 +102,7 @@ class FocusManagerDelegate : public views::FocusManagerDelegate { |
const ui::Accelerator& accelerator) const override { |
return accelerator_manager_->IsRegistered(accelerator, AF_NONE) |
? accelerator_manager_ |
- : NULL; |
+ : nullptr; |
} |
private: |
@@ -126,7 +126,8 @@ class FocusManagerFactory : public views::FocusManagerFactory { |
bool desktop_widget) override { |
return new views::FocusManager( |
widget, |
- desktop_widget ? NULL : new FocusManagerDelegate(accelerator_manager_)); |
+ desktop_widget ? nullptr |
+ : new FocusManagerDelegate(accelerator_manager_)); |
} |
private: |
@@ -246,7 +247,7 @@ AcceleratorManagerImpl::~AcceleratorManagerImpl() { |
accelerator_filter_.reset(); |
// Reset to use the default focus manager because the athena's |
// FocusManager has the reference to this object. |
- views::FocusManagerFactory::Install(NULL); |
+ views::FocusManagerFactory::Install(nullptr); |
} |
void AcceleratorManagerImpl::Init() { |