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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/wm/bezel_controller.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/virtual_keyboard/virtual_keyboard_manager_impl.cc ('k') | athena/wm/split_view_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/bezel_controller.cc
diff --git a/athena/wm/bezel_controller.cc b/athena/wm/bezel_controller.cc
index 63168a8268162fa9f55010548000e3f41eab187f..6924aa603957faa6c09563beb0d0ae0c53dde850 100644
--- a/athena/wm/bezel_controller.cc
+++ b/athena/wm/bezel_controller.cc
@@ -67,8 +67,8 @@ BezelController::BezelController(aura::Window* container)
: container_(container),
state_(NONE),
scroll_bezel_(BEZEL_NONE),
- scroll_target_(NULL),
- left_right_delegate_(NULL) {
+ scroll_target_(nullptr),
+ left_right_delegate_(nullptr) {
}
void BezelController::SetState(BezelController::State state) {
@@ -88,7 +88,7 @@ void BezelController::SetState(BezelController::State state,
if (state == NONE) {
scroll_bezel_ = BEZEL_NONE;
- scroll_target_ = NULL;
+ scroll_target_ = nullptr;
}
if (state == BEZEL_SCROLLING_TWO_FINGERS) {
« no previous file with comments | « athena/virtual_keyboard/virtual_keyboard_manager_impl.cc ('k') | athena/wm/split_view_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698