| Index: athena/content/app_activity_proxy.cc
|
| diff --git a/athena/content/app_activity_proxy.cc b/athena/content/app_activity_proxy.cc
|
| index f3a058190a1f794b1c4dc75e52fe2348abb271d5..80e9938a99fefd3de025228766733f48d415e96d 100644
|
| --- a/athena/content/app_activity_proxy.cc
|
| +++ b/athena/content/app_activity_proxy.cc
|
| @@ -60,7 +60,7 @@ aura::Window* AppActivityProxy::GetWindow() {
|
| }
|
|
|
| content::WebContents* AppActivityProxy::GetWebContents() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| void AppActivityProxy::Init() {
|
| @@ -73,7 +73,7 @@ void AppActivityProxy::Init() {
|
| replaced_activity_->GetWindow());
|
| // After the Init() function returns, the passed |replaced_activity_| might
|
| // get destroyed. Since we do not need it anymore we reset it.
|
| - replaced_activity_ = NULL;
|
| + replaced_activity_ = nullptr;
|
| }
|
|
|
| SkColor AppActivityProxy::GetRepresentativeColor() const {
|
| @@ -97,7 +97,7 @@ views::View* AppActivityProxy::GetContentsView() {
|
| }
|
|
|
| views::Widget* AppActivityProxy::CreateWidget() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() {
|
|
|