NULL -> nullptr under athena/

athena/system/network_selector.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/system/network_selector.h"
 
 #include "athena/screen/public/screen_manager.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/network/network_configuration_handler.h"
@@ skipping 39 matching lines @@
 namespace {
 
 // The View for the user to enter the password for connceting to a network. This
 // view also shows an error message if the network connection fails.
 class PasswordView : public views::View, public views::ButtonListener {
  public:
   PasswordView(const ui::NetworkInfo& network,
                const base::Callback<void(bool)>& callback)
       : network_(network),
         callback_(callback),
-        connect_(NULL),
-        cancel_(NULL),
-        textfield_(NULL),
-        error_msg_(NULL),
+        connect_(nullptr),
+        cancel_(nullptr),
+        textfield_(nullptr),
+        error_msg_(nullptr),
         weak_ptr_(this) {
     const int kHorizontal = 5;
     const int kVertical = 0;
     const int kPadding = 0;
 
     views::BoxLayout* layout = new views::BoxLayout(
         views::BoxLayout::kVertical, kHorizontal, kVertical, kPadding);
     layout->set_main_axis_alignment(
         views::BoxLayout::MAIN_AXIS_ALIGNMENT_START);
     layout->set_cross_axis_alignment(
@@ skipping 82 matching lines @@
       textfield_->RequestFocus();
   }
 
   // views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) override {
     if (sender == connect_) {
       if (error_msg_) {
         RemoveChildView(error_msg_);
         delete error_msg_;
-        error_msg_ = NULL;
+        error_msg_ = nullptr;
       }
       connect_->SetEnabled(false);
       NetworkHandler::Get()->network_configuration_handler()->SetNetworkProfile(
           network_.service_path,
           NetworkProfileHandler::GetSharedProfilePath(),
           base::Bind(&PasswordView::OnSetProfileSucceed,
                      weak_ptr_.GetWeakPtr(),
                      textfield_->text()),
           base::Bind(&PasswordView::OnKnownError, weak_ptr_.GetWeakPtr()));
     } else if (sender == cancel_) {
@@ skipping 133 matching lines @@
   base::WeakPtrFactory<NetworkRow> weak_ptr_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkRow);
 };
 
 class NetworkSelector : public ui::NetworkListDelegate,
                         public chromeos::NetworkStateHandlerObserver,
                         public views::DialogDelegate {
  public:
   NetworkSelector()
-      : scroll_content_(NULL), scroller_(NULL), network_list_(this) {
+      : scroll_content_(nullptr), scroller_(nullptr), network_list_(this) {
     CreateNetworkList();
     CreateWidget();
 
     NetworkHandler::Get()->network_state_handler()->RequestScan();
     NetworkHandler::Get()->network_state_handler()->AddObserver(this,
                                                                 FROM_HERE);
   }
 
   virtual ~NetworkSelector() {
     NetworkHandler::Get()->network_state_handler()->RemoveObserver(this,
                                                                    FROM_HERE);
   }
 
  private:
   void CreateWidget() {
     // Same as CreateDialogWidgetWithBounds() with an empty |bounds|.
     views::Widget* widget = views::DialogDelegate::CreateDialogWidget(
-        this, athena::ScreenManager::Get()->GetContext(), NULL);
+        this, athena::ScreenManager::Get()->GetContext(), nullptr);
     widget->Show();
     widget->CenterWindow(gfx::Size(400, 400));
   }
 
   void CreateNetworkList() {
     const int kListHeight = 400;
     scroller_ = new views::ScrollView();
     scroller_->set_background(
         views::Background::CreateSolidBackground(SK_ColorWHITE));
 
@@ skipping 75 matching lines @@
 
 }  // namespace
 
 namespace athena {
 
 void CreateNetworkSelector() {
   new NetworkSelector();
 }
 
 }  // namespace athena