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

Unified Diff: athena/extensions/athena_app_delegate_base.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/env/athena_env_impl.cc ('k') | athena/extensions/chrome/app_list_controller_delegate_athena.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « athena/env/athena_env_impl.cc ('k') | athena/extensions/chrome/app_list_controller_delegate_athena.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698