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

Unified Diff: extensions/browser/extension_function_dispatcher.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/extension_function_dispatcher.cc
diff --git a/extensions/browser/extension_function_dispatcher.cc b/extensions/browser/extension_function_dispatcher.cc
index a825d0169260f19b9939e7428d3bd7a0e211d0e5..a6ac22eb0574b14c9a8512ec0069ed94e8589c98 100644
--- a/extensions/browser/extension_function_dispatcher.cc
+++ b/extensions/browser/extension_function_dispatcher.cc
@@ -197,12 +197,12 @@ class ExtensionFunctionDispatcher::UIThreadResponseCallbackWrapper
WindowController*
ExtensionFunctionDispatcher::Delegate::GetExtensionWindowController() const {
- return NULL;
+ return nullptr;
}
content::WebContents*
ExtensionFunctionDispatcher::Delegate::GetAssociatedWebContents() const {
- return NULL;
+ return nullptr;
}
content::WebContents*
@@ -297,7 +297,7 @@ void ExtensionFunctionDispatcher::Dispatch(
RenderViewHost* render_view_host) {
UIThreadResponseCallbackWrapperMap::const_iterator
iter = ui_thread_response_callback_wrappers_.find(render_view_host);
- UIThreadResponseCallbackWrapper* callback_wrapper = NULL;
+ UIThreadResponseCallbackWrapper* callback_wrapper = nullptr;
if (iter == ui_thread_response_callback_wrappers_.end()) {
callback_wrapper = new UIThreadResponseCallbackWrapper(AsWeakPtr(),
render_view_host);
@@ -307,7 +307,9 @@ void ExtensionFunctionDispatcher::Dispatch(
}
DispatchWithCallbackInternal(
- params, render_view_host, NULL,
+ params,
+ render_view_host,
+ nullptr,
callback_wrapper->CreateCallback(params.request_id));
}
@@ -444,7 +446,7 @@ ExtensionFunction* ExtensionFunctionDispatcher::CreateExtensionFunction(
if (!function) {
LOG(ERROR) << "Unknown Extension API - " << params.name;
SendAccessDenied(callback);
- return NULL;
+ return nullptr;
}
function->SetArgs(&params.arguments);

Powered by Google App Engine
This is Rietveld 408576698