Index: extensions/browser/guest_view/web_view/web_view_guest.cc |
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc |
index deb840e58ff34fcee684fa906eb28de17358b1f3..6622afff93aa025c01427b639a8490286beae07f 100644 |
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc |
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc |
@@ -204,7 +204,7 @@ void WebViewGuest::CreateWebContents( |
base::KillProcess( |
embedder_render_process_host->GetHandle(), |
content::RESULT_CODE_KILLED_BAD_MESSAGE, false); |
- callback.Run(NULL); |
+ callback.Run(nullptr); |
return; |
} |
std::string url_encoded_partition = net::EscapeQueryParamValue( |
@@ -855,7 +855,7 @@ content::ColorChooser* WebViewGuest::OpenColorChooser( |
SkColor color, |
const std::vector<content::ColorSuggestion>& suggestions) { |
if (!attached() || !embedder_web_contents()->GetDelegate()) |
- return NULL; |
+ return nullptr; |
return embedder_web_contents()->GetDelegate()->OpenColorChooser( |
web_contents, color, suggestions); |
} |
@@ -1009,12 +1009,12 @@ content::WebContents* WebViewGuest::OpenURLFromTab( |
PendingWindowMap::iterator it = |
opener->pending_new_windows_.find(this); |
if (it == opener->pending_new_windows_.end()) |
- return NULL; |
+ return nullptr; |
const NewWindowInfo& info = it->second; |
NewWindowInfo new_window_info(params.url, info.name); |
new_window_info.changed = new_window_info.url != info.url; |
it->second = new_window_info; |
- return NULL; |
+ return nullptr; |
} |
if (params.disposition == CURRENT_TAB) { |
// This can happen for cross-site redirects. |
@@ -1023,7 +1023,7 @@ content::WebContents* WebViewGuest::OpenURLFromTab( |
} |
CreateNewGuestWebViewWindow(params); |
- return NULL; |
+ return nullptr; |
} |
void WebViewGuest::WebContentsCreated(WebContents* source_contents, |