Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(597)

Unified Diff: athena/content/web_contents_view_delegate_factory_impl.cc

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/content/web_activity.cc ('k') | athena/env/athena_env_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « athena/content/web_activity.cc ('k') | athena/env/athena_env_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698