| Index: athena/extensions/athena_app_delegate_base.cc
|
| diff --git a/athena/extensions/athena_app_delegate_base.cc b/athena/extensions/athena_app_delegate_base.cc
|
| index 3c4a1e49cf56c416d342e62fb8930611dfae17be..49b8e6d666123188958f51d2d8a52e30ebc850b4 100644
|
| --- a/athena/extensions/athena_app_delegate_base.cc
|
| +++ b/athena/extensions/athena_app_delegate_base.cc
|
| @@ -25,7 +25,7 @@ content::WebContents* OpenURLInActivity(content::BrowserContext* context,
|
| context, base::string16(), params.url);
|
| Activity::Show(activity);
|
| // TODO(oshima): Get the web cotnents from activity.
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| } // namespace
|
| @@ -43,7 +43,7 @@ class AthenaAppDelegateBase::NewActivityContentsDelegate
|
| content::WebContents* source,
|
| const content::OpenURLParams& params) override {
|
| if (!source)
|
| - return NULL;
|
| + return nullptr;
|
| return OpenURLInActivity(source->GetBrowserContext(), params);
|
| }
|
|
|
|
|