| Index: extensions/renderer/dispatcher.cc
|
| diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
|
| index 80ee4ecd45f98ea75a24e203a254afdee5039167..27f0922ab553e53e7d568061fdbfcdcf09c5838c 100644
|
| --- a/extensions/renderer/dispatcher.cc
|
| +++ b/extensions/renderer/dispatcher.cc
|
| @@ -813,7 +813,7 @@ void Dispatcher::OnDeliverMessage(int target_port_id, const Message& message) {
|
| MessagingBindings::DeliverMessage(script_context_set_,
|
| target_port_id,
|
| message,
|
| - NULL); // All render views.
|
| + nullptr); // All render views.
|
| }
|
|
|
| void Dispatcher::OnDispatchOnConnect(
|
| @@ -834,7 +834,7 @@ void Dispatcher::OnDispatchOnConnect(
|
| source_tab,
|
| info,
|
| tls_channel_id,
|
| - NULL); // All render views.
|
| + nullptr); // All render views.
|
| }
|
|
|
| void Dispatcher::OnDispatchOnDisconnect(int port_id,
|
| @@ -842,7 +842,7 @@ void Dispatcher::OnDispatchOnDisconnect(int port_id,
|
| MessagingBindings::DispatchOnDisconnect(script_context_set_,
|
| port_id,
|
| error_message,
|
| - NULL); // All render views.
|
| + nullptr); // All render views.
|
| }
|
|
|
| void Dispatcher::OnLoaded(
|
| @@ -873,7 +873,7 @@ void Dispatcher::OnMessageInvoke(const std::string& extension_id,
|
| const base::ListValue& args,
|
| bool user_gesture) {
|
| InvokeModuleSystemMethod(
|
| - NULL, extension_id, module_name, function_name, args, user_gesture);
|
| + nullptr, extension_id, module_name, function_name, args, user_gesture);
|
| }
|
|
|
| void Dispatcher::OnSetChannel(int channel) {
|
| @@ -1121,7 +1121,7 @@ void Dispatcher::UpdateBindingsForContext(ScriptContext* context) {
|
|
|
| // If this API has a parent feature (and isn't marked 'noparent'),
|
| // then this must be a function or event, so we should not register.
|
| - if (api_feature_provider->GetParent(feature) != NULL)
|
| + if (api_feature_provider->GetParent(feature) != nullptr)
|
| continue;
|
|
|
| // Skip chrome.test if this isn't a test.
|
|
|