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

Unified Diff: athena/input/accelerator_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/home/home_card_unittest.cc ('k') | athena/input/input_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « athena/home/home_card_unittest.cc ('k') | athena/input/input_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698