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

Unified Diff: extensions/browser/guest_view/guest_view_manager.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
Index: extensions/browser/guest_view/guest_view_manager.cc
diff --git a/extensions/browser/guest_view/guest_view_manager.cc b/extensions/browser/guest_view/guest_view_manager.cc
index 77a46c6ab4b7095bb86e07b3df20b76d7478646b..679099aaaecfe0de696ef627f28c548bb63ade3c 100644
--- a/extensions/browser/guest_view/guest_view_manager.cc
+++ b/extensions/browser/guest_view/guest_view_manager.cc
@@ -26,7 +26,7 @@ using content::WebContents;
namespace extensions {
// static
-GuestViewManagerFactory* GuestViewManager::factory_ = NULL;
+GuestViewManagerFactory* GuestViewManager::factory_ = nullptr;
GuestViewManager::GuestViewManager(content::BrowserContext* context)
: current_instance_id_(0), last_instance_id_removed_(0), context_(context) {
@@ -56,7 +56,7 @@ content::WebContents* GuestViewManager::GetGuestByInstanceIDSafely(
int embedder_render_process_id) {
if (!CanEmbedderAccessInstanceIDMaybeKill(embedder_render_process_id,
guest_instance_id)) {
- return NULL;
+ return nullptr;
}
return GetGuestByInstanceID(guest_instance_id);
}
@@ -121,7 +121,7 @@ void GuestViewManager::CreateGuest(const std::string& view_type,
GuestViewBase* guest =
GuestViewBase::Create(context_, guest_instance_id, view_type);
if (!guest) {
- callback.Run(NULL);
+ callback.Run(nullptr);
return;
}
guest->Init(
@@ -137,7 +137,7 @@ content::WebContents* GuestViewManager::CreateGuestWithWebContentsParams(
GuestViewBase* guest =
GuestViewBase::Create(context_, guest_instance_id, view_type);
if (!guest)
- return NULL;
+ return nullptr;
content::WebContents::CreateParams guest_create_params(create_params);
guest_create_params.guest_delegate = guest;
content::WebContents* guest_web_contents =
@@ -154,7 +154,7 @@ content::WebContents* GuestViewManager::GetGuestByInstanceID(
int guest_instance_id = GetGuestInstanceIDForElementID(embedder_web_contents,
element_instance_id);
if (guest_instance_id == guestview::kInstanceIDNone)
- return NULL;
+ return nullptr;
return GetGuestByInstanceID(guest_instance_id);
}
@@ -177,7 +177,7 @@ SiteInstance* GuestViewManager::GetGuestSiteInstance(
if (it->second->GetSiteInstance()->GetSiteURL() == guest_site)
return it->second->GetSiteInstance();
}
- return NULL;
+ return nullptr;
}
bool GuestViewManager::ForEachGuest(WebContents* embedder_web_contents,
@@ -246,7 +246,7 @@ content::WebContents* GuestViewManager::GetGuestByInstanceID(
GuestInstanceMap::const_iterator it =
guest_web_contents_by_instance_id_.find(guest_instance_id);
if (it == guest_web_contents_by_instance_id_.end())
- return NULL;
+ return nullptr;
return it->second;
}

Powered by Google App Engine
This is Rietveld 408576698