| Index: extensions/browser/extension_function.cc
|
| diff --git a/extensions/browser/extension_function.cc b/extensions/browser/extension_function.cc
|
| index 0969bcded3f69e8b5da6ceeb83af506cc11bcfc1..c15b184da85abf8393fbecfe227d8a9577ec2823 100644
|
| --- a/extensions/browser/extension_function.cc
|
| +++ b/extensions/browser/extension_function.cc
|
| @@ -134,14 +134,14 @@ class UIThreadExtensionFunction::RenderHostTracker
|
| if (render_view_host != function_->render_view_host())
|
| return;
|
|
|
| - function_->SetRenderViewHost(NULL);
|
| + function_->SetRenderViewHost(nullptr);
|
| }
|
| virtual void RenderFrameDeleted(
|
| content::RenderFrameHost* render_frame_host) OVERRIDE {
|
| if (render_frame_host != function_->render_frame_host())
|
| return;
|
|
|
| - function_->SetRenderFrameHost(NULL);
|
| + function_->SetRenderFrameHost(nullptr);
|
| }
|
|
|
| virtual bool OnMessageReceived(
|
| @@ -165,7 +165,7 @@ class UIThreadExtensionFunction::RenderHostTracker
|
|
|
| ExtensionFunction::ExtensionFunction()
|
| : request_id_(-1),
|
| - profile_id_(NULL),
|
| + profile_id_(nullptr),
|
| has_callback_(false),
|
| include_incognito_(false),
|
| user_gesture_(false),
|
| @@ -179,11 +179,11 @@ ExtensionFunction::~ExtensionFunction() {
|
| }
|
|
|
| UIThreadExtensionFunction* ExtensionFunction::AsUIThreadExtensionFunction() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| IOThreadExtensionFunction* ExtensionFunction::AsIOThreadExtensionFunction() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| bool ExtensionFunction::HasPermission() {
|
| @@ -336,10 +336,10 @@ void ExtensionFunction::OnRespondingLater(ResponseValue value) {
|
| }
|
|
|
| UIThreadExtensionFunction::UIThreadExtensionFunction()
|
| - : render_view_host_(NULL),
|
| - render_frame_host_(NULL),
|
| - context_(NULL),
|
| - delegate_(NULL) {
|
| + : render_view_host_(nullptr),
|
| + render_frame_host_(nullptr),
|
| + context_(nullptr),
|
| + delegate_(nullptr) {
|
| }
|
|
|
| UIThreadExtensionFunction::~UIThreadExtensionFunction() {
|
| @@ -364,18 +364,18 @@ void UIThreadExtensionFunction::SetRenderViewHost(
|
| RenderViewHost* render_view_host) {
|
| DCHECK(!render_frame_host_);
|
| render_view_host_ = render_view_host;
|
| - tracker_.reset(render_view_host ? new RenderHostTracker(this) : NULL);
|
| + tracker_.reset(render_view_host ? new RenderHostTracker(this) : nullptr);
|
| }
|
|
|
| void UIThreadExtensionFunction::SetRenderFrameHost(
|
| content::RenderFrameHost* render_frame_host) {
|
| DCHECK(!render_view_host_);
|
| render_frame_host_ = render_frame_host;
|
| - tracker_.reset(render_frame_host ? new RenderHostTracker(this) : NULL);
|
| + tracker_.reset(render_frame_host ? new RenderHostTracker(this) : nullptr);
|
| }
|
|
|
| content::WebContents* UIThreadExtensionFunction::GetAssociatedWebContents() {
|
| - content::WebContents* web_contents = NULL;
|
| + content::WebContents* web_contents = nullptr;
|
| if (dispatcher())
|
| web_contents = dispatcher()->delegate()->GetAssociatedWebContents();
|
|
|
|
|