| Index: athena/content/web_contents_view_delegate_factory_impl.cc
|
| diff --git a/athena/content/web_contents_view_delegate_factory_impl.cc b/athena/content/web_contents_view_delegate_factory_impl.cc
|
| index 4aa304e3264b6925f6f871aa2450408e0b63f9e5..410a39e356f6c51165fe6096a029d52ccda46726 100644
|
| --- a/athena/content/web_contents_view_delegate_factory_impl.cc
|
| +++ b/athena/content/web_contents_view_delegate_factory_impl.cc
|
| @@ -29,7 +29,7 @@ class WebContentsViewDelegateImpl : public content::WebContentsViewDelegate {
|
| virtual content::WebDragDestDelegate* GetDragDestDelegate() override {
|
| // TODO(oshima): crbug.com/401610
|
| NOTIMPLEMENTED();
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| virtual bool Focus() override {
|
| @@ -128,7 +128,7 @@ class WebContentsViewDelegateImpl : public content::WebContentsViewDelegate {
|
|
|
| views::FocusManager* GetFocusManager() {
|
| views::Widget* toplevel_widget = GetTopLevelWidget();
|
| - return toplevel_widget ? toplevel_widget->GetFocusManager() : NULL;
|
| + return toplevel_widget ? toplevel_widget->GetFocusManager() : nullptr;
|
| }
|
|
|
| void SetInitialFocus() {
|
|
|