NULL -> nullptr under athena/

athena/content/app_activity.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/content/app_activity.h"
 
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/content/content_proxy.h"
 #include "athena/content/media_utils.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/public/window_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/aura/window.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_util.h"
 
 namespace athena {
 
 // TODO(mukai): specifies the same accelerators of WebActivity.
-AppActivity::AppActivity(const std::string& app_id,
-                         views::WebView* web_view)
+AppActivity::AppActivity(const std::string& app_id, views::WebView* web_view)
     : app_id_(app_id),
       web_view_(web_view),
       current_state_(ACTIVITY_UNLOADED),
-      app_activity_registry_(NULL) {
+      app_activity_registry_(nullptr) {
   Observe(web_view->GetWebContents());
 }
 
 scoped_ptr<ContentProxy> AppActivity::GetContentProxy() {
   // Note: After this call, the content is still valid because the contents
   // destruction will destroy this |AppActivity| object.
   if (content_proxy_.get())
     content_proxy_->OnPreContentDestroyed();
   return content_proxy_.Pass();
 }
@@ skipping 48 matching lines @@
          current_state_ != ACTIVITY_UNLOADED;
 }
 
 Activity::ActivityMediaState AppActivity::GetMediaState() {
   return current_state_ == ACTIVITY_UNLOADED ?
       Activity::ACTIVITY_MEDIA_STATE_NONE :
       GetActivityMediaState(GetWebContents());
 }
 
 aura::Window* AppActivity::GetWindow() {
-  return !web_view_ ? NULL : web_view_->GetWidget()->GetNativeWindow();
+  return !web_view_ ? nullptr : web_view_->GetWidget()->GetNativeWindow();
 }
 
 content::WebContents* AppActivity::GetWebContents() {
-  return !web_view_ ? NULL : web_view_->GetWebContents();
+  return !web_view_ ? nullptr : web_view_->GetWebContents();
 }
 
 void AppActivity::Init() {
   DCHECK(app_activity_registry_);
   Activity* app_proxy = app_activity_registry_->unloaded_activity_proxy();
   if (app_proxy) {
     // Note: At this time the |AppActivity| did not get registered to the
     // |ResourceManager| - so we can move it around if needed.
     WindowListProvider* window_list_provider =
         WindowManager::Get()->GetWindowListProvider();
@@ skipping 79 matching lines @@
   // Turn on fast resizing to avoid re-laying out the web contents when
   // entering / exiting overview mode and the content is visible.
   if (!content_proxy_.get()) {
     web_view_->SetFastResize(false);
     web_view_->Layout();
   }
 }
 
 AppActivity::AppActivity(const std::string& app_id)
     : app_id_(app_id),
-      web_view_(NULL),
+      web_view_(nullptr),
       current_state_(ACTIVITY_UNLOADED),
-      app_activity_registry_(NULL) {
+      app_activity_registry_(nullptr) {
 }
 
 AppActivity::~AppActivity() {
   // If this activity is registered, we unregister it now.
   if (app_activity_registry_)
     app_activity_registry_->UnregisterAppActivity(this);
 }
 
 void AppActivity::TitleWasSet(content::NavigationEntry* entry,
                               bool explicit_set) {
@@ skipping 22 matching lines @@
 void AppActivity::HideContentProxy() {
   content_proxy_.reset();
 }
 
 void AppActivity::ShowContentProxy() {
   if (!content_proxy_.get() && web_view_)
     content_proxy_.reset(new ContentProxy(web_view_));
 }
 
 }  // namespace athena