From f847291272d42bb179c22a2ca8474638f522b0fa Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Fri, 4 Aug 2017 20:41:34 +0300 Subject: [PATCH] [blink] Unique pointers in Platform.h https://codereview.chromium.org/2846843002 --- atom/renderer/renderer_client_base.cc | 6 ++++-- atom/renderer/renderer_client_base.h | 2 +- chromium_src/chrome/renderer/tts_dispatcher.h | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/atom/renderer/renderer_client_base.cc b/atom/renderer/renderer_client_base.cc index cc2e84261ae5..22d1261610d4 100644 --- a/atom/renderer/renderer_client_base.cc +++ b/atom/renderer/renderer_client_base.cc @@ -17,6 +17,7 @@ #include "atom/renderer/guest_view_container.h" #include "atom/renderer/preferences_manager.h" #include "base/command_line.h" +#include "base/memory/ptr_util.h" #include "base/strings/string_split.h" #include "chrome/renderer/media/chrome_key_systems.h" #include "chrome/renderer/pepper/pepper_helper.h" @@ -179,9 +180,10 @@ void RendererClientBase::DidClearWindowObject( render_frame->GetWebFrame()->ExecuteScript(blink::WebScriptSource("void 0")); } -blink::WebSpeechSynthesizer* RendererClientBase::OverrideSpeechSynthesizer( +std::unique_ptr +RendererClientBase::OverrideSpeechSynthesizer( blink::WebSpeechSynthesizerClient* client) { - return new TtsDispatcher(client); + return base::MakeUnique(client); } bool RendererClientBase::OverrideCreatePlugin( diff --git a/atom/renderer/renderer_client_base.h b/atom/renderer/renderer_client_base.h index d629739b80d5..a4e7e3ab293e 100644 --- a/atom/renderer/renderer_client_base.h +++ b/atom/renderer/renderer_client_base.h @@ -40,7 +40,7 @@ class RendererClientBase : public content::ContentRendererClient { void RenderThreadStarted() override; void RenderFrameCreated(content::RenderFrame*) override; void RenderViewCreated(content::RenderView*) override; - blink::WebSpeechSynthesizer* OverrideSpeechSynthesizer( + std::unique_ptr OverrideSpeechSynthesizer( blink::WebSpeechSynthesizerClient* client) override; bool OverrideCreatePlugin(content::RenderFrame* render_frame, blink::WebLocalFrame* frame, diff --git a/chromium_src/chrome/renderer/tts_dispatcher.h b/chromium_src/chrome/renderer/tts_dispatcher.h index 71609110491d..df31d88d4ee8 100644 --- a/chromium_src/chrome/renderer/tts_dispatcher.h +++ b/chromium_src/chrome/renderer/tts_dispatcher.h @@ -30,10 +30,9 @@ class TtsDispatcher public content::RenderThreadObserver { public: explicit TtsDispatcher(blink::WebSpeechSynthesizerClient* client); - - private: virtual ~TtsDispatcher(); + private: // RenderProcessObserver override. virtual bool OnControlMessageReceived(const IPC::Message& message) override;