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

Unified Diff: athena/content/app_activity_proxy.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/app_activity_browsertest.cc ('k') | athena/content/app_activity_registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « athena/content/app_activity_browsertest.cc ('k') | athena/content/app_activity_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698