From: v-saha Date: Mon, 26 Dec 2022 12:07:22 +0000 (+0530) Subject: Remove DISALLOW_COPY_AND_ASSIGN macros from tizen_src directory X-Git-Tag: submit/tizen/20230227.160252~182 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d23c4f8cdfebaa9c58b8d111f4dc424ea1960d1;p=platform%2Fframework%2Fweb%2Fchromium-efl.git Remove DISALLOW_COPY_AND_ASSIGN macros from tizen_src directory As per upstream changes [1], this patch replaces all occurances of DISALLOW_COPY_AND_ASSIGN macros with deleted copy and move constructors inside tizen_src/. [1] https://bugs.chromium.org/p/chromium/issues/detail?id=1010217 Change-Id: Ice2f7b8b227b6ae9409aae4277fe18b00fd65501 Signed-off-by: v-saha --- diff --git a/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.h b/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.h index 42343c2..5bf8454 100644 --- a/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.h +++ b/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.h @@ -26,6 +26,10 @@ class JavaScriptDialogManagerEfl: public JavaScriptDialogManager { JavaScriptDialogManagerEfl(); ~JavaScriptDialogManagerEfl() override; + JavaScriptDialogManagerEfl(const JavaScriptDialogManagerEfl&) = delete; + JavaScriptDialogManagerEfl& operator=(const JavaScriptDialogManagerEfl&) = + delete; + // Displays a JavaScript dialog. |did_suppress_message| will not be nil; if // |true| is returned in it, the caller will handle faking the reply. void RunJavaScriptDialog(WebContents* web_contents, @@ -56,8 +60,6 @@ class JavaScriptDialogManagerEfl: public JavaScriptDialogManager { private: std::map open_dialogs_; - - // DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManagerEfl); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/browser/media/browser_mediapacket_manager.h b/tizen_src/chromium_impl/content/browser/media/browser_mediapacket_manager.h index c6b0470..1c89f013 100644 --- a/tizen_src/chromium_impl/content/browser/media/browser_mediapacket_manager.h +++ b/tizen_src/chromium_impl/content/browser/media/browser_mediapacket_manager.h @@ -13,6 +13,11 @@ namespace content { class CONTENT_EXPORT BrowserMediaPacketManager : public BrowserMessageFilter { public: BrowserMediaPacketManager(); + + BrowserMediaPacketManager(const BrowserMediaPacketManager&) = delete; + BrowserMediaPacketManager& operator=(const BrowserMediaPacketManager&) = + delete; + bool OnMessageReceived(const IPC::Message& message) override; protected: @@ -21,8 +26,6 @@ class CONTENT_EXPORT BrowserMediaPacketManager : public BrowserMessageFilter { private: void ReleaseMediaPacket(gfx::TbmBufferHandle packet); - - // DISALLOW_COPY_AND_ASSIGN(BrowserMediaPacketManager); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/browser/media/efl/browser_demuxer_efl.cc b/tizen_src/chromium_impl/content/browser/media/efl/browser_demuxer_efl.cc index abb8811..6f98ce0 100644 --- a/tizen_src/chromium_impl/content/browser/media/efl/browser_demuxer_efl.cc +++ b/tizen_src/chromium_impl/content/browser/media/efl/browser_demuxer_efl.cc @@ -20,6 +20,9 @@ class BrowserDemuxerEfl::Internal : public media::DemuxerEfl { demuxer_->RemoveDemuxerClient(demuxer_client_id_); } + Internal(const Internal&) = delete; + Internal& operator=(const Internal&) = delete; + // |media::DemuxerEfl| implementation. void Initialize(media::DemuxerEflClient* client) override { DCHECK(!ClientIDExists()) << demuxer_client_id_; @@ -47,8 +50,6 @@ class BrowserDemuxerEfl::Internal : public media::DemuxerEfl { scoped_refptr demuxer_; int demuxer_client_id_; - - // DISALLOW_COPY_AND_ASSIGN(Internal); }; scoped_refptr CreateBrowserDemuxerEfl() { diff --git a/tizen_src/chromium_impl/content/browser/media/efl/browser_demuxer_efl.h b/tizen_src/chromium_impl/content/browser/media/efl/browser_demuxer_efl.h index 89bc8d3..58bb56b 100644 --- a/tizen_src/chromium_impl/content/browser/media/efl/browser_demuxer_efl.h +++ b/tizen_src/chromium_impl/content/browser/media/efl/browser_demuxer_efl.h @@ -21,6 +21,9 @@ class CONTENT_EXPORT BrowserDemuxerEfl : public BrowserMessageFilter { public: BrowserDemuxerEfl(); + BrowserDemuxerEfl(const BrowserDemuxerEfl&) = delete; + BrowserDemuxerEfl& operator=(const BrowserDemuxerEfl&) = delete; + // BrowserMessageFilter overrides. void OverrideThreadForMessage( const IPC::Message& message, @@ -62,8 +65,6 @@ class CONTENT_EXPORT BrowserDemuxerEfl : public BrowserMessageFilter { const base::TimeDelta& duration); IDMap demuxer_clients_; - - // DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerEfl); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.h b/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.h index 4cf57aa..c6d1851 100644 --- a/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.h +++ b/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.h @@ -27,6 +27,10 @@ class CONTENT_EXPORT BrowserMediaPlayerManagerEfl static BrowserMediaPlayerManagerEfl* Create(RenderFrameHost* rfh); ~BrowserMediaPlayerManagerEfl() override; + BrowserMediaPlayerManagerEf(const BrowserMediaPlayerManagerEf&) = delete; + BrowserMediaPlayerManagerEf& operator=(const BrowserMediaPlayerManagerEf&) = + delete; + // media::MediaPlayerManager implementation. media::MediaPlayerEfl* GetPlayer(int player_id) override; void OnTimeChanged(int player_id) override; @@ -109,8 +113,6 @@ class CONTENT_EXPORT BrowserMediaPlayerManagerEfl // A queue to initialize player including preroll. std::deque init_queue_; std::deque resumed_queue_; - - // DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManagerEfl); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/browser/media/media_web_contents_observer_efl.h b/tizen_src/chromium_impl/content/browser/media/media_web_contents_observer_efl.h index ea87968..716d66b 100644 --- a/tizen_src/chromium_impl/content/browser/media/media_web_contents_observer_efl.h +++ b/tizen_src/chromium_impl/content/browser/media/media_web_contents_observer_efl.h @@ -24,6 +24,9 @@ class CONTENT_EXPORT MediaWebContentsObserver explicit MediaWebContentsObserver(WebContents* web_contents); virtual ~MediaWebContentsObserver(); + MediaWebContentsObserver(const MediaWebContentsObserver&) = delete; + MediaWebContentsObserver& operator=(const MediaWebContentsObserver&) = delete; + // WebContentsObserver implementations. virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; virtual bool OnMessageReceived(const IPC::Message& message, @@ -40,8 +43,6 @@ class CONTENT_EXPORT MediaWebContentsObserver scoped_ptr> MediaPlayerManagerMap; MediaPlayerManagerMap media_player_managers_; - - // DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/browser/screen_orientation/screen_orientation_delegate_efl.h b/tizen_src/chromium_impl/content/browser/screen_orientation/screen_orientation_delegate_efl.h index a258c8a..b27ca4ca 100644 --- a/tizen_src/chromium_impl/content/browser/screen_orientation/screen_orientation_delegate_efl.h +++ b/tizen_src/chromium_impl/content/browser/screen_orientation/screen_orientation_delegate_efl.h @@ -19,15 +19,16 @@ class ScreenOrientationDelegateEfl : public ScreenOrientationDelegate { ScreenOrientationDelegateEfl(); ~ScreenOrientationDelegateEfl() override; + ScreenOrientationDelegateEfl(const ScreenOrientationDelegateEfl&) = delete; + ScreenOrientationDelegateEfl& operator=(const ScreenOrientationDelegateEfl&) = + delete; + // ScreenOrientationDelegate: bool FullScreenRequired(WebContents* web_contents) override; void Lock(WebContents* web_contents, device::mojom::ScreenOrientationLockType lock_orientation) override; bool ScreenOrientationProviderSupported(WebContents* web_contents) override; void Unlock(WebContents* web_contents) override; - - private: - // DISALLOW_COPY_AND_ASSIGN(ScreenOrientationDelegateEfl); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/browser/speech/tts_message_filter_efl.h b/tizen_src/chromium_impl/content/browser/speech/tts_message_filter_efl.h index 4a85445..d5c5cf0 100644 --- a/tizen_src/chromium_impl/content/browser/speech/tts_message_filter_efl.h +++ b/tizen_src/chromium_impl/content/browser/speech/tts_message_filter_efl.h @@ -20,6 +20,10 @@ class CONTENT_EXPORT TtsMessageFilterEfl public base::SupportsWeakPtr { public: TtsMessageFilterEfl(); + + TtsMessageFilterEfl(const TtsMessageFilterEfl&) = delete; + TtsMessageFilterEfl& operator=(const TtsMessageFilterEfl&) = delete; + // content::BrowserMessageFilter implementation. void OverrideThreadForMessage( const IPC::Message& message, @@ -43,8 +47,6 @@ class CONTENT_EXPORT TtsMessageFilterEfl void OnCancel(); std::unique_ptr tts_tizen_; - - // DISALLOW_COPY_AND_ASSIGN(TtsMessageFilterEfl); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.h b/tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.h index 8071dc7..79744b4 100644 --- a/tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.h +++ b/tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.h @@ -20,13 +20,15 @@ class CONTENT_EXPORT TracingControllerEfl { private: TracingControllerEfl(); + + TracingControllerEfl(const TracingControllerEfl&) = delete; + TracingControllerEfl& operator=(const TracingControllerEfl&) = delete; + void OnTracingStopped(); bool is_tracing_; base::WeakPtrFactory weak_factory_; std::string trace_file_name_; - - // DISALLOW_COPY_AND_ASSIGN(TracingControllerEfl); }; #endif // IMPL_BROWSER_TRACING_TRACING_CONTROLLER_EFL_H_ diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.h b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.h index dc86f0a..26efada 100644 --- a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.h +++ b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.h @@ -23,6 +23,9 @@ class WebDragDestEfl { WebDragDestEfl(WebContents* web_contents); ~WebDragDestEfl(); + WebDragDestEfl(const WebDragDestEfl&) = delete; + WebDragDestEfl& operator=(const WebDragDestEfl&) = delete; + blink::DragOperationsMask GetAction() { return drag_action_; } WebDragDestDelegate* GetDelegate() const { return delegate_; } DropData* GetDropData() { return drop_data_.get(); } @@ -73,8 +76,6 @@ class WebDragDestEfl { // The data for the current drag, or NULL if |context_| is NULL. std::unique_ptr drop_data_; - - // DISALLOW_COPY_AND_ASSIGN(WebDragDestEfl); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.h b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.h index 28a4e55..da355cb 100644 --- a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.h +++ b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.h @@ -30,6 +30,9 @@ class WebDragSourceEfl { explicit WebDragSourceEfl(WebContents* web_contents); virtual ~WebDragSourceEfl(); + WebDragSourceEfl(const WebDragSourceEfl&) = delete; + WebDragSourceEfl& operator=(const WebDragSourceEfl&) = delete; + // Starts a drag for the WebContents this object was created for. // Returns false if the drag could not be started. bool StartDragging(const DropData& drop_data, @@ -96,8 +99,6 @@ class WebDragSourceEfl { gfx::Point initial_position_; gfx::Point last_pointer_pos_; - - // DISALLOW_COPY_AND_ASSIGN(WebDragSourceEfl); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_decode_accelerator.h b/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_decode_accelerator.h index 4dcb2a7..1e34431 100644 --- a/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_decode_accelerator.h +++ b/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_decode_accelerator.h @@ -18,6 +18,10 @@ class CONTENT_EXPORT TizenVideoDecodeAccelerator TizenVideoDecodeAccelerator(); ~TizenVideoDecodeAccelerator() override; + TizenVideoDecodeAccelerator(const TizenVideoDecodeAccelerator&) = delete; + TizenVideoDecodeAccelerator& operator=(const TizenVideoDecodeAccelerator&) = + delete; + bool Initialize(const Config& config, Client* client) override; void Decode(const media::BitstreamBuffer& bitstream_buffer) override; void AssignPictureBuffers( @@ -37,8 +41,6 @@ class CONTENT_EXPORT TizenVideoDecodeAccelerator void StartDecoder(); Impl* impl_; - - // DISALLOW_COPY_AND_ASSIGN(TizenVideoDecodeAccelerator); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_encode_accelerator.h b/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_encode_accelerator.h index d4e2e12..943fac2 100644 --- a/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_encode_accelerator.h +++ b/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_encode_accelerator.h @@ -19,6 +19,10 @@ class CONTENT_EXPORT TizenVideoEncodeAccelerator TizenVideoEncodeAccelerator(); ~TizenVideoEncodeAccelerator() override; + TizenVideoEncodeAccelerator(const TizenVideoEncodeAccelerator&) = delete; + TizenVideoEncodeAccelerator& operator=(const TizenVideoEncodeAccelerator&) = + delete; + std::vector GetSupportedProfiles() override; bool Initialize(media::VideoPixelFormat input_format, @@ -43,8 +47,6 @@ class CONTENT_EXPORT TizenVideoEncodeAccelerator bool StartEncoder(); Impl* impl_; - - // DISALLOW_COPY_AND_ASSIGN(TizenVideoEncodeAccelerator); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/renderer/media/efl/renderer_demuxer_efl.h b/tizen_src/chromium_impl/content/renderer/media/efl/renderer_demuxer_efl.h index d6c75b7..90b762b 100644 --- a/tizen_src/chromium_impl/content/renderer/media/efl/renderer_demuxer_efl.h +++ b/tizen_src/chromium_impl/content/renderer/media/efl/renderer_demuxer_efl.h @@ -28,6 +28,9 @@ class RendererDemuxerEfl : public IPC::MessageFilter { public: RendererDemuxerEfl(); + RendererDemuxerEfl(const RendererDemuxerEfl&) = delete; + RendererDemuxerEfl& operator=(const RendererDemuxerEfl&) = delete; + // Returns the next available demuxer client ID for use in IPC messages. // // Safe to call on any thread. @@ -78,8 +81,6 @@ class RendererDemuxerEfl : public IPC::MessageFilter { IDMap delegates_; scoped_refptr thread_safe_sender_; scoped_refptr media_task_runner_; - - // DISALLOW_COPY_AND_ASSIGN(RendererDemuxerEfl); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.h b/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.h index 8a478ab..a9f888b 100644 --- a/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.h +++ b/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.h @@ -26,6 +26,10 @@ class RendererMediaPlayerManager : public RenderFrameObserver { explicit RendererMediaPlayerManager(RenderFrame* render_frame); ~RendererMediaPlayerManager() override; + RendererMediaPlayerManager(const RendererMediaPlayerManager&) = delete; + RendererMediaPlayerManager& operator=(const RendererMediaPlayerManager&) = + delete; + // Initializes a MediaPlayerEfl object in browser process. void Initialize(int player_id, MediaPlayerHostMsg_Initialize_Type type, const GURL& url, double volume, int demuxer_client_id); @@ -94,8 +98,6 @@ class RendererMediaPlayerManager : public RenderFrameObserver { private: std::map media_players_; int next_media_player_id_; - - // DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h b/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h index cbc95af..bed7ba6 100644 --- a/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h +++ b/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h @@ -63,6 +63,9 @@ class WebMediaPlayerEfl const media::WebMediaPlayerParams& params); ~WebMediaPlayerEfl() override; + WebMediaPlayerEfl(const WebMediaPlayerEfl&) = delete; + WebMediaPlayerEfl& operator=(const WebMediaPlayerEfl&) = delete; + // blink::WebMediaPlayer implementation. void load(LoadType load_type, const blink::WebURL& url, @@ -254,8 +257,6 @@ class WebMediaPlayerEfl #if defined(TIZEN_MULTIMEDIA_EME_SUPPORT) scoped_ptr encrypted_media_support_; #endif - - // DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerEfl); }; } // namespace content diff --git a/tizen_src/chromium_impl/content/renderer/media/tizen/audio_decoder_capi.cc b/tizen_src/chromium_impl/content/renderer/media/tizen/audio_decoder_capi.cc index 33a00b3..8f46615 100644 --- a/tizen_src/chromium_impl/content/renderer/media/tizen/audio_decoder_capi.cc +++ b/tizen_src/chromium_impl/content/renderer/media/tizen/audio_decoder_capi.cc @@ -25,6 +25,10 @@ class AudioDecoderIO { public: AudioDecoderIO(const char* data, size_t data_size); virtual ~AudioDecoderIO(); + + AudioDecoderIO(const AudioDecoderIO&) = delete; + AudioDecoderIO& operator=(const AudioDecoderIO&) = delete; + bool ShareEncodedDataToProcess(base::SharedMemoryHandle* handle); // Returns true if |AudioDecoderIO| was successfully created. @@ -42,8 +46,6 @@ class AudioDecoderIO { // write_fd_ and writes to it. int read_fd_; int write_fd_; - - // DISALLOW_COPY_AND_ASSIGN(AudioDecoderIO); }; AudioDecoderIO::AudioDecoderIO(const char* data, size_t data_size) diff --git a/tizen_src/chromium_impl/content/renderer/tts_dispatcher_efl.h b/tizen_src/chromium_impl/content/renderer/tts_dispatcher_efl.h index 0049513..e99cf79 100644 --- a/tizen_src/chromium_impl/content/renderer/tts_dispatcher_efl.h +++ b/tizen_src/chromium_impl/content/renderer/tts_dispatcher_efl.h @@ -37,6 +37,9 @@ class CONTENT_EXPORT TtsDispatcherEfl private: ~TtsDispatcherEfl() override; + TtsDispatcherEfl(const TtsDispatcherEfl&) = delete; + TtsDispatcherEfl& operator=(const TtsDispatcherEfl&) = delete; + // RenderThreadObserver override. bool OnControlMessageReceived(const IPC::Message& message) override; @@ -71,8 +74,6 @@ class CONTENT_EXPORT TtsDispatcherEfl // Map from id to utterance objects. std::map utterance_id_map_; - - // DISALLOW_COPY_AND_ASSIGN(TtsDispatcherEfl); }; } // namespace content diff --git a/tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.h b/tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.h index 108fe07..63be660 100644 --- a/tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.h +++ b/tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.h @@ -15,6 +15,10 @@ class BatteryStatusManagerTizen : public BatteryStatusManager { const BatteryStatusService::BatteryUpdateCallback& callback); ~BatteryStatusManagerTizen() override; + BatteryStatusManagerTizen(const BatteryStatusManagerTizen&) = delete; + BatteryStatusManagerTizen& operator=(const BatteryStatusManagerTizen&) = + delete; + BatteryStatus GetCurrentStatus() const { return current_status_; } void SetCurrentStatus(BatteryStatus status) { current_status_ = status; } @@ -31,8 +35,6 @@ class BatteryStatusManagerTizen : public BatteryStatusManager { BatteryStatus current_status_; BatteryStatusService::BatteryUpdateCallback callback_; - - // DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerTizen); }; } // namespace content diff --git a/tizen_src/chromium_impl/media/audio/tizen/audio_manager_capi.h b/tizen_src/chromium_impl/media/audio/tizen/audio_manager_capi.h index b2d03c6..5c31cc3 100644 --- a/tizen_src/chromium_impl/media/audio/tizen/audio_manager_capi.h +++ b/tizen_src/chromium_impl/media/audio/tizen/audio_manager_capi.h @@ -18,6 +18,9 @@ class MEDIA_EXPORT AudioManagerCapi : public AudioManagerBase { explicit AudioManagerCapi(AudioLogFactory* audio_log_factory); ~AudioManagerCapi() override; + AudioManagerCapi(const AudioManagerCapi&) = delete; + AudioManagerCapi& operator=(const AudioManagerCapi&) = delete; + static AudioManager* Create(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. @@ -59,8 +62,6 @@ class MEDIA_EXPORT AudioManagerCapi : public AudioManagerBase { const std::string& device_id); int native_input_sample_rate_; - - // DISALLOW_COPY_AND_ASSIGN(AudioManagerCapi); }; } // namespace media diff --git a/tizen_src/chromium_impl/media/audio/tizen/capi_audio_input.h b/tizen_src/chromium_impl/media/audio/tizen/capi_audio_input.h index eafd569..97d50f6 100644 --- a/tizen_src/chromium_impl/media/audio/tizen/capi_audio_input.h +++ b/tizen_src/chromium_impl/media/audio/tizen/capi_audio_input.h @@ -30,6 +30,9 @@ class CapiAudioInputStream final : public AgcAudioStream { ~CapiAudioInputStream() override; + CapiAudioInputStream(const CapiAudioInputStream&) = delete; + CapiAudioInputStream& operator=(const CapiAudioInputStream&) = delete; + bool Open() override; void Start(AudioInputCallback* callback) override; void Stop() override; @@ -58,8 +61,6 @@ class CapiAudioInputStream final : public AgcAudioStream { // Holds the data from the OS. AudioBlockFifo fifo_; - - // DISALLOW_COPY_AND_ASSIGN(CapiAudioInputStream); }; } // namespace media diff --git a/tizen_src/chromium_impl/media/audio/tizen/capi_audio_output.h b/tizen_src/chromium_impl/media/audio/tizen/capi_audio_output.h index 4ad7228..5d58a57 100644 --- a/tizen_src/chromium_impl/media/audio/tizen/capi_audio_output.h +++ b/tizen_src/chromium_impl/media/audio/tizen/capi_audio_output.h @@ -28,6 +28,9 @@ class CapiAudioOutputStream : public AudioOutputStream { ~CapiAudioOutputStream() override; + CapiAudioOutputStream(const CapiAudioOutputStream&) = delete; + CapiAudioOutputStream& operator=(const CapiAudioOutputStream&) = delete; + bool Open() override; void Close() override; void Start(AudioSourceCallback* callback) override; @@ -51,8 +54,6 @@ class CapiAudioOutputStream : public AudioOutputStream { media::InternalState state_; AudioSourceCallback* source_callback_; std::unique_ptr audio_bus_; - - // DISALLOW_COPY_AND_ASSIGN(CapiAudioOutputStream); }; } // namespace media diff --git a/tizen_src/chromium_impl/media/base/efl/media_player_efl.h b/tizen_src/chromium_impl/media/base/efl/media_player_efl.h index 57fe9cf..2ced3a2 100644 --- a/tizen_src/chromium_impl/media/base/efl/media_player_efl.h +++ b/tizen_src/chromium_impl/media/base/efl/media_player_efl.h @@ -73,6 +73,9 @@ class MEDIA_EXPORT MediaPlayerEfl { protected: explicit MediaPlayerEfl(int player_id, MediaPlayerManager* manager); + MediaPlayerEfl(const MediaPlayerEfl&) = delete; + MediaPlayerEfl& operator=(const MediaPlayerEfl&) = delete; + // Release the player resources. virtual void Release() = 0; MediaPlayerManager* manager() { return manager_; } @@ -92,8 +95,6 @@ class MEDIA_EXPORT MediaPlayerEfl { // Resource manager for all the media players. MediaPlayerManager* manager_; - - // DISALLOW_COPY_AND_ASSIGN(MediaPlayerEfl); }; } // namespace media diff --git a/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.h b/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.h index e42a11a..6b51945 100644 --- a/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.h +++ b/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.h @@ -27,6 +27,9 @@ class MEDIA_EXPORT MediaPlayerBridgeCapi const std::string& user_agent); ~MediaPlayerBridgeCapi() override; + MediaPlayerBridgeCapi(const MediaPlayerBridgeCapi&) = delete; + MediaPlayerBridgeCapi& operator=(const MediaPlayerBridgeCapi&) = delete; + // MediaPlayerTizen implementation. void Initialize() override; void Resume() override; @@ -108,8 +111,6 @@ class MEDIA_EXPORT MediaPlayerBridgeCapi // NOTE: Weak pointers must be invalidated before all other member variables. base::WeakPtrFactory weak_factory_; - - // DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridgeCapi); }; } // namespace media diff --git a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h index 299d4b7..a2d0ae0 100644 --- a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h +++ b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h @@ -32,6 +32,9 @@ class MEDIA_EXPORT MediaSourcePlayerCapi ~MediaSourcePlayerCapi() override; + MediaSourcePlayerCapi(const MediaSourcePlayerCapi&) = delete; + MediaSourcePlayerCapi& operator=(const MediaSourcePlayerCapi&) = delete; + // MediaPlayerEfl implementation. void Play() override; void Pause(bool is_media_related_action) override; @@ -135,8 +138,6 @@ class MEDIA_EXPORT MediaSourcePlayerCapi std::deque > video_buffer_queue_; base::WeakPtrFactory weak_factory_; - - // DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayerCapi); }; } // namespace media diff --git a/tizen_src/chromium_impl/media/base/tizen/webaudio_decoder_browser_capi.h b/tizen_src/chromium_impl/media/base/tizen/webaudio_decoder_browser_capi.h index bf704cb..147cd62 100644 --- a/tizen_src/chromium_impl/media/base/tizen/webaudio_decoder_browser_capi.h +++ b/tizen_src/chromium_impl/media/base/tizen/webaudio_decoder_browser_capi.h @@ -24,6 +24,9 @@ class MEDIA_EXPORT WebAudioDecoderCapi : public WebAudioDecoder { static WebAudioDecoderCapi* GetInstance(); virtual ~WebAudioDecoderCapi(); + WebAudioDecoderCapi(const WebAudioDecoderCapi&) = delete; + WebAudioDecoderCapi& operator=(const WebAudioDecoderCapi&) = delete; + // media::WebAudioDecoder implementation. void EncodedDataReceived(base::SharedMemoryHandle memory_handle, base::FileDescriptor pcm_output, @@ -37,8 +40,6 @@ class MEDIA_EXPORT WebAudioDecoderCapi : public WebAudioDecoder { uint32_t data_size); base::Thread capi_thread_; - - // DISALLOW_COPY_AND_ASSIGN(WebAudioDecoderCapi); }; class AudioDecoderCapi { diff --git a/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_factory_tizen.cc b/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_factory_tizen.cc index 5414053..e1bd0d7 100644 --- a/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_factory_tizen.cc +++ b/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_factory_tizen.cc @@ -193,10 +193,12 @@ class CameraHandle final { camera_destroy(camera_handle_); } + CameraHandle(const CameraHandle&) = delete; + CameraHandle& operator=(const CameraHandle&) = delete; + camera_h camera_handle_; friend struct base::DefaultSingletonTraits; - // DISALLOW_COPY_AND_ASSIGN(CameraHandle); }; } // namespace diff --git a/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_factory_tizen.h b/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_factory_tizen.h index 065163a..6257dd4 100644 --- a/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_factory_tizen.h +++ b/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_factory_tizen.h @@ -20,6 +20,11 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryTizen scoped_refptr ui_task_runner); ~VideoCaptureDeviceFactoryTizen() override; + VideoCaptureDeviceFactoryTizen(const VideoCaptureDeviceFactoryTizen&) = + delete; + VideoCaptureDeviceFactoryTizen& operator=( + const VideoCaptureDeviceFactoryTizen&) = delete; + scoped_ptr Create( const VideoCaptureDevice::Name& device_name) override; void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; @@ -29,8 +34,6 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryTizen private: scoped_refptr ui_task_runner_; - - // DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryTizen); }; } // namespace media diff --git a/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h b/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h index 851d400..6f8c3cc 100644 --- a/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h +++ b/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h @@ -47,6 +47,10 @@ class ClipboardHelperEfl { private: ClipboardHelperEfl(); + + ClipboardHelperEfl(const ClipboardHelperEfl&) = delete; + ClipboardHelperEfl& operator=(const ClipboardHelperEfl&) = delete; + friend struct base::DefaultSingletonTraits; // TODO: Webview TG will implement following for Wayland. @@ -63,7 +67,6 @@ class ClipboardHelperEfl { #endif void clearClipboardHandler(); void initializeAtomList(); - // DISALLOW_COPY_AND_ASSIGN(ClipboardHelperEfl); Ecore_Event_Handler* m_selectionClearHandler; Ecore_Event_Handler* m_selectionNotifyHandler; diff --git a/tizen_src/chromium_impl/ui/display/device_display_info_efl.cc b/tizen_src/chromium_impl/ui/display/device_display_info_efl.cc index a2ab542..9e4c91b 100644 --- a/tizen_src/chromium_impl/ui/display/device_display_info_efl.cc +++ b/tizen_src/chromium_impl/ui/display/device_display_info_efl.cc @@ -74,6 +74,10 @@ class DISPLAY_EXPORT DeviceDisplayInfoEflImpl { private: DeviceDisplayInfoEflImpl(); + + DeviceDisplayInfoEflImpl(const DeviceDisplayInfoEflImpl&) = delete; + DeviceDisplayInfoEflImpl& operator=(const DeviceDisplayInfoEflImpl&) = delete; + void NotifyDeviceDisplayInfoChanged(); friend struct base::DefaultSingletonTraits; @@ -86,8 +90,6 @@ class DISPLAY_EXPORT DeviceDisplayInfoEflImpl { double dip_scale_; int rotation_degrees_; base::ObserverList::Unchecked observer_list_; - - // DISALLOW_COPY_AND_ASSIGN(DeviceDisplayInfoEflImpl); }; // static diff --git a/tizen_src/chromium_impl/ui/display/device_display_info_efl.h b/tizen_src/chromium_impl/ui/display/device_display_info_efl.h index 47aeb3a..beb26c7 100644 --- a/tizen_src/chromium_impl/ui/display/device_display_info_efl.h +++ b/tizen_src/chromium_impl/ui/display/device_display_info_efl.h @@ -18,6 +18,9 @@ class DISPLAY_EXPORT DeviceDisplayInfoEfl { public: explicit DeviceDisplayInfoEfl(); + DeviceDisplayInfoEfl(const DeviceDisplayInfoEfl&) = delete; + DeviceDisplayInfoEfl& operator=(const DeviceDisplayInfoEfl&) = delete; + // Update all info. void Update(int display_width, int display_height, double dip_scale, int rotation_degrees); @@ -44,9 +47,6 @@ class DISPLAY_EXPORT DeviceDisplayInfoEfl { void AddObserver(DeviceDisplayInfoObserverEfl* observer); void RemoveObserver(DeviceDisplayInfoObserverEfl* observer); - - private: - // DISALLOW_COPY_AND_ASSIGN(DeviceDisplayInfoEfl); }; } // namespace display diff --git a/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.h b/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.h index e4cd931..0a270e9 100644 --- a/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.h +++ b/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.h @@ -35,6 +35,10 @@ class AutofillClientEfl public content::WebContentsObserver { public: virtual ~AutofillClientEfl(); + + AutofillClientEfl(const AutofillClientEfl&) = delete; + AutofillClientEfl& operator=(const AutofillClientEfl&) = delete; + // Called when the tab corresponding to |this| instance is activated. void TabActivated(); // AutofillManagerDelegate implementation. @@ -96,8 +100,6 @@ class AutofillClientEfl EWebView* webview_; scoped_refptr database_; AutofillPopupViewEfl* popup_controller_; - - // DISALLOW_COPY_AND_ASSIGN(AutofillClientEfl); }; } // namespace autofill diff --git a/tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.h b/tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.h index 2d3100e..662449e 100644 --- a/tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.h +++ b/tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.h @@ -49,9 +49,12 @@ class PersonalDataManagerFactory : public PersonalDataManagerObserver { PersonalDataManagerFactory(); ~PersonalDataManagerFactory(); + PersonalDataManagerFactory(const PersonalDataManagerFactory&) = delete; + PersonalDataManagerFactory& operator=(const PersonalDataManagerFactory&) = + delete; + IDMap personal_data_manager_id_map_; - // DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerFactory); Ewk_Context_Form_Autofill_Profile_Changed_Callback callback_; void* callback_user_data_; }; diff --git a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.h b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.h index 2dc138d..c82436a 100644 --- a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.h +++ b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.h @@ -36,7 +36,9 @@ class FaviconDatabase { private: FaviconDatabase(); - // DISALLOW_COPY_AND_ASSIGN(FaviconDatabase); + + FaviconDatabase(const FaviconDatabase&) = delete; + FaviconDatabase& operator=(const FaviconDatabase&) = delete; bool IsOpen() const; bool Open(); diff --git a/tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.h b/tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.h index 301f936..8c4a142 100644 --- a/tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.h +++ b/tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.h @@ -27,6 +27,9 @@ class FaviconDownloader : public content::WebContentsObserver { FaviconDownloaderCallback callback); virtual ~FaviconDownloader() {} + FaviconDownloader(const FaviconDownloader&) = delete; + FaviconDownloader& operator=(const FaviconDownloader&) = delete; + void Start(); private: @@ -41,7 +44,6 @@ class FaviconDownloader : public content::WebContentsObserver { GURL m_faviconUrl; FaviconDownloaderCallback m_callback; base::WeakPtrFactory m_weakPtrFactory; - // DISALLOW_COPY_AND_ASSIGN(FaviconDownloader); }; #endif // FAVICON_DOWNLOADER_H diff --git a/tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.h b/tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.h index cd439db..b47d447 100644 --- a/tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.h +++ b/tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.h @@ -31,14 +31,16 @@ class LocationProviderEfl : public LocationProviderBase { private: LocationProviderEfl(); + + LocationProviderEfl(const LocationProviderEfl&) = delete; + LocationProviderEfl& operator=(const LocationProviderEfl&) = delete; + static void GeoPositionChangedCb(double, double, double, time_t, void*); void NotifyPositionChanged(double, double, double, time_t); Geoposition last_position_; location_manager_h location_manager_; base::MessageLoop* geolocation_message_loop_; - - // DISALLOW_COPY_AND_ASSIGN(LocationProviderEfl); }; } // namespace content diff --git a/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h index 313af2c..12a8314 100644 --- a/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h +++ b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h @@ -50,6 +50,10 @@ class JavaScriptDialogManagerEfl : public content::JavaScriptDialogManager { JavaScriptDialogManagerEfl(); virtual ~JavaScriptDialogManagerEfl(); + JavaScriptDialogManagerEfl(const JavaScriptDialogManagerEfl&) = delete; + JavaScriptDialogManagerEfl& operator=(const JavaScriptDialogManagerEfl&) = + delete; + // JavaScriptDialogManager: void RunJavaScriptDialog(content::WebContents* web_contents, content::RenderFrameHost* render_frame_host, @@ -83,8 +87,6 @@ class JavaScriptDialogManagerEfl : public content::JavaScriptDialogManager { std::unique_ptr confirm_callback_data_; std::unique_ptr prompt_callback_data_; DialogClosedCallback dialog_closed_callback_; - - // DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManagerEfl); }; #endif /* JAVASCRIPT_DIALOG_MANAGER_EFL_H_ */ diff --git a/tizen_src/ewk/efl_integration/browser/mime_override_manager_efl.h b/tizen_src/ewk/efl_integration/browser/mime_override_manager_efl.h index 6b2dffa..0c53e44 100644 --- a/tizen_src/ewk/efl_integration/browser/mime_override_manager_efl.h +++ b/tizen_src/ewk/efl_integration/browser/mime_override_manager_efl.h @@ -31,12 +31,13 @@ class MimeOverrideManagerEfl { private: MimeOverrideManagerEfl() {} + MimeOverrideManagerEfl(const MimeOverrideManagerEfl&) = delete; + MimeOverrideManagerEfl& operator=(const MimeOverrideManagerEfl&) = delete; + friend struct base::DefaultSingletonTraits; base::Lock lock_; MimeOverrideMap mime_override_map_; - - // DISALLOW_COPY_AND_ASSIGN(MimeOverrideManagerEfl); }; #endif // MIME_OVERRIDE_MANAGER_EFL_H_ diff --git a/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h index 1d270e4..57974f2 100644 --- a/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h +++ b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h @@ -84,6 +84,10 @@ class NotificationControllerEfl : public PlatformNotificationService { NotificationControllerEfl(); ~NotificationControllerEfl() override; + NotificationControllerEfl(const NotificationControllerEfl&) = delete; + NotificationControllerEfl& operator=(const NotificationControllerEfl&) = + delete; + void NotificationCancelled(uint64_t notification_id); bool NotificationClosed(uint64_t notification_id, bool by_user) { @@ -196,8 +200,6 @@ class NotificationControllerEfl : public PlatformNotificationService { std::unique_ptr permission_handler_; std::unique_ptr default_callback_; std::unique_ptr notification_helper_; - - // DISALLOW_COPY_AND_ASSIGN(NotificationControllerEfl); }; } // namespace content diff --git a/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h index 71e7921..f3a26a2 100644 --- a/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h +++ b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h @@ -62,6 +62,10 @@ public: private: explicit PasswordManagerClientEfl(content::WebContents* web_contents, autofill::AutofillClient* autofill_client); + + PasswordManagerClientEfl(const PasswordManagerClientEfl&) = delete; + PasswordManagerClientEfl& operator=(const PasswordManagerClientEfl&) = delete; + friend class content::WebContentsUserData; // This filter does not filter out anything, it is a dummy implementation of @@ -89,8 +93,6 @@ public: // Allows authentication callbacks to be destroyed when this client is gone. base::WeakPtrFactory weak_factory_; - - // DISALLOW_COPY_AND_ASSIGN(PasswordManagerClientEfl); }; } diff --git a/tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.h index 7691e6c..4f5d05e 100644 --- a/tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.h +++ b/tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.h @@ -22,11 +22,13 @@ class PasswordStoreService { explicit PasswordStoreService(scoped_refptr password_store); virtual ~PasswordStoreService(); + PasswordStoreService(const PasswordStoreService&) = delete; + PasswordStoreService& operator=(const PasswordStoreService&) = delete; + scoped_refptr GetPasswordStore(); private: scoped_refptr password_store_; - // DISALLOW_COPY_AND_ASSIGN(PasswordStoreService); }; // Singleton that owns all PasswordStores and associates them with @@ -42,11 +44,13 @@ class PasswordStoreFactory { friend struct base::DefaultSingletonTraits; PasswordStoreFactory(); virtual ~PasswordStoreFactory(); + + PasswordStoreFactory(const PasswordStoreFactory&) = delete; + PasswordStoreFactory& operator=(const PasswordStoreFactory&) = delete; + void Init(); std::unique_ptr service_; - - // DISALLOW_COPY_AND_ASSIGN(PasswordStoreFactory); }; } #endif // TIZEN_AUTOFILL_SUPPORT diff --git a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h index f6c113b..83a4fe3 100644 --- a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h @@ -42,6 +42,9 @@ class SSLHostStateDelegateEfl : public SSLHostStateDelegate { SSLHostStateDelegateEfl(); ~SSLHostStateDelegateEfl() override; + SSLHostStateDelegateEfl(const SSLHostStateDelegateEfl&) = delete; + SSLHostStateDelegateEfl& operator=(const SSLHostStateDelegateEfl&) = delete; + // Records that |cert| is permitted to be used for |host| in the future, for // a specified |error| type. void AllowCert(const std::string& host, @@ -93,8 +96,6 @@ class SSLHostStateDelegateEfl : public SSLHostStateDelegate { private: // Certificate policies for each host. std::map cert_policy_for_host_; - - // DISALLOW_COPY_AND_ASSIGN(SSLHostStateDelegateEfl); }; } diff --git a/tizen_src/ewk/efl_integration/browser/vibration/vibration_provider_client.h b/tizen_src/ewk/efl_integration/browser/vibration/vibration_provider_client.h index a560e28..fd150b2 100644 --- a/tizen_src/ewk/efl_integration/browser/vibration/vibration_provider_client.h +++ b/tizen_src/ewk/efl_integration/browser/vibration/vibration_provider_client.h @@ -23,11 +23,13 @@ class VibrationProviderClientEwk: public device::VibrationProviderClient { , cancel_vibration_cb_(nullptr) , user_data_(nullptr) {} + VibrationProviderClientEwk(const VibrationProviderClientEwk&) = delete; + VibrationProviderClientEwk& operator=(const VibrationProviderClientEwk&) = + delete; + Ewk_Vibration_Client_Vibrate_Cb vibrate_cb_; Ewk_Vibration_Client_Vibration_Cancel_Cb cancel_vibration_cb_; void* user_data_; - - // DISALLOW_COPY_AND_ASSIGN(VibrationProviderClientEwk); }; #endif // Vibration_Provider_Client_h diff --git a/tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.h b/tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.h index 015ffe9..9a6c3b8 100644 --- a/tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.h +++ b/tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.h @@ -23,6 +23,9 @@ class WebCacheManagerEfl : public content::NotificationObserver { explicit WebCacheManagerEfl(content::BrowserContext* browser_context); virtual ~WebCacheManagerEfl(); + WebCacheManagerEfl(const WebCacheManagerEfl&) = delete; + WebCacheManagerEfl& operator=(const WebCacheManagerEfl&) = delete; + // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, @@ -46,7 +49,6 @@ class WebCacheManagerEfl : public content::NotificationObserver { std::set renderers_; content::BrowserContext* browser_context_; Ewk_Cache_Model cache_model_; - // DISALLOW_COPY_AND_ASSIGN(WebCacheManagerEfl); }; #endif diff --git a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service.h b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service.h index 7fc149d..cb6a2a9 100644 --- a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service.h +++ b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service.h @@ -60,8 +60,8 @@ class WebDataService : public WebDataServiceBase { WebDataService(); virtual ~WebDataService(); - private: - // DISALLOW_COPY_AND_ASSIGN(WebDataService); + WebDataService(const WebDataService&) = delete; + WebDataService& operator=(const WebDataService&) = delete; }; #endif // TIZEN_AUTOFILL_SUPPORT diff --git a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.h b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.h index 7cf6b0d..14a1e2b 100644 --- a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.h +++ b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.h @@ -25,6 +25,9 @@ class WebDataServiceWrapper{ virtual ~WebDataServiceWrapper(); + WebDataServiceWrapper(const WebDataServiceWrapper&) = delete; + WebDataServiceWrapper& operator=(const WebDataServiceWrapper&) = delete; + virtual scoped_refptr GetAutofillWebData(); virtual scoped_refptr GetWebData(); @@ -35,8 +38,6 @@ class WebDataServiceWrapper{ scoped_refptr autofill_web_data_; scoped_refptr web_data_; - - // DISALLOW_COPY_AND_ASSIGN(WebDataServiceWrapper); }; // Singleton that owns all WebDataServiceWrappers @@ -56,7 +57,8 @@ class WebDataServiceFactory { WebDataServiceFactory(); virtual ~WebDataServiceFactory(); - // DISALLOW_COPY_AND_ASSIGN(WebDataServiceFactory); + WebDataServiceFactory(const WebDataServiceFactory&) = delete; + WebDataServiceFactory& operator=(const WebDataServiceFactory&) = delete; }; #endif // TIZEN_AUTOFILL_SUPPORT diff --git a/tizen_src/ewk/efl_integration/browser_context_efl.h b/tizen_src/ewk/efl_integration/browser_context_efl.h index 764f735..8980035 100644 --- a/tizen_src/ewk/efl_integration/browser_context_efl.h +++ b/tizen_src/ewk/efl_integration/browser_context_efl.h @@ -40,6 +40,9 @@ class BrowserContextEfl : public BrowserContext, ResourceContextEfl(scoped_refptr cookie_manager); ~ResourceContextEfl(); + ResourceContextEfl(const ResourceContextEfl&) = delete; + ResourceContextEfl& operator=(const ResourceContextEfl&) = delete; + bool HTTPCustomHeaderAdd(const std::string& name, const std::string& value); bool HTTPCustomHeaderRemove(const std::string& name); void HTTPCustomHeaderClear(); @@ -56,13 +59,14 @@ class BrowserContextEfl : public BrowserContext, scoped_refptr cookie_manager_; HTTPCustomHeadersEflMap http_custom_headers_; mutable base::Lock http_custom_headers_lock_; - - // DISALLOW_COPY_AND_ASSIGN(ResourceContextEfl); }; BrowserContextEfl(EWebContext*, bool incognito = false); ~BrowserContextEfl(); + BrowserContextEfl(const BrowserContextEfl&) = delete; + BrowserContextEfl& operator=(const BrowserContextEfl&) = delete; + // BrowserContext implementation. net::URLRequestContextGetter* CreateMediaRequestContext(); net::URLRequestContextGetter* CreateMediaRequestContextForStoragePartition( @@ -139,8 +143,6 @@ class BrowserContextEfl : public BrowserContext, std::unique_ptr ssl_host_state_delegate_; std::unique_ptr background_sync_controller_; std::unique_ptr permission_controller_delegate_; - - // DISALLOW_COPY_AND_ASSIGN(BrowserContextEfl); }; } diff --git a/tizen_src/ewk/efl_integration/browser_main_parts_efl.h b/tizen_src/ewk/efl_integration/browser_main_parts_efl.h index ea9512d..a6206fc 100644 --- a/tizen_src/ewk/efl_integration/browser_main_parts_efl.h +++ b/tizen_src/ewk/efl_integration/browser_main_parts_efl.h @@ -20,14 +20,15 @@ class BrowserMainPartsEfl : public BrowserMainParts { BrowserMainPartsEfl(); ~BrowserMainPartsEfl() override; + BrowserMainPartsEfl(const BrowserMainPartsEfl&) = delete; + BrowserMainPartsEfl& operator=(const BrowserMainPartsEfl&) = delete; + // BrowserMainParts overrides. int PreMainMessageLoopRun() override; void PostMainMessageLoopRun() override; private: DevToolsDelegateEfl* devtools_delegate_; - - // DISALLOW_COPY_AND_ASSIGN(BrowserMainPartsEfl); }; } // namespace content diff --git a/tizen_src/ewk/efl_integration/common/version_info.h b/tizen_src/ewk/efl_integration/common/version_info.h index 7032645..11e0be7 100644 --- a/tizen_src/ewk/efl_integration/common/version_info.h +++ b/tizen_src/ewk/efl_integration/common/version_info.h @@ -86,11 +86,12 @@ class VersionInfo { VersionInfo(); ~VersionInfo() { } + VersionInfo(const VersionInfo&) = delete; + VersionInfo& operator=(const VersionInfo&) = delete; + std::string product_name_; std::string product_version_; static VersionInfo* version_info_; - - // DISALLOW_COPY_AND_ASSIGN(VersionInfo); }; } // namespace EflWebView diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.h b/tizen_src/ewk/efl_integration/content_browser_client_efl.h index 6159164..9071a2d 100644 --- a/tizen_src/ewk/efl_integration/content_browser_client_efl.h +++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.h @@ -30,6 +30,9 @@ class ContentBrowserClientEfl : public ContentBrowserClient { ContentBrowserClientEfl(); ~ContentBrowserClientEfl() override; + + ContentBrowserClientEfl(const ContentBrowserClientEfl&) = delete; + ContentBrowserClientEfl& operator=(const ContentBrowserClientEfl&) = delete; typedef base::OnceCallback AcceptLangsChangedCallback; @@ -150,8 +153,6 @@ class ContentBrowserClientEfl : public ContentBrowserClient { std::vector accept_langs_changed_callbacks_; bool shutting_down_ = false; - - // DISALLOW_COPY_AND_ASSIGN(ContentBrowserClientEfl); }; } // namespace content diff --git a/tizen_src/ewk/efl_integration/content_main_delegate_efl.h b/tizen_src/ewk/efl_integration/content_main_delegate_efl.h index f26a3e8..470710f 100644 --- a/tizen_src/ewk/efl_integration/content_main_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/content_main_delegate_efl.h @@ -20,6 +20,9 @@ class ContentMainDelegateEfl ContentMainDelegateEfl() = default; ~ContentMainDelegateEfl() override = default; + ContentMainDelegateEfl(const ContentMainDelegateEfl&) = delete; + ContentMainDelegateEfl& operator=(const ContentMainDelegateEfl&) = delete; + // ContentMainDelegate implementation: absl::optional BasicStartupComplete() override; void PreSandboxStartup() override; @@ -34,7 +37,6 @@ class ContentMainDelegateEfl std::unique_ptr browser_client_; std::unique_ptr renderer_client_; ContentClientEfl content_client_; - // DISALLOW_COPY_AND_ASSIGN(ContentMainDelegateEfl); }; } diff --git a/tizen_src/ewk/efl_integration/cookie_manager.h b/tizen_src/ewk/efl_integration/cookie_manager.h index 78e81ac..61467fd 100644 --- a/tizen_src/ewk/efl_integration/cookie_manager.h +++ b/tizen_src/ewk/efl_integration/cookie_manager.h @@ -32,6 +32,10 @@ class CookieManager : public base::RefCountedThreadSafe { CookieManager(); virtual ~CookieManager(); + + CookieManager(const CookieManager&) = delete; + CookieManager& operator=(const CookieManager&) = delete; + // Delete all cookies that match the specified parameters. If both |url| and // values |cookie_name| are specified all host and domain cookies matching // both will be deleted. If only |url| is specified all host cookies (but not @@ -120,8 +124,6 @@ class CookieManager : public base::RefCountedThreadSafe { base::WeakPtrFactory weak_ptr_factory_; // file scheme base::Lock file_scheme_lock_; - - // DISALLOW_COPY_AND_ASSIGN(CookieManager); }; #endif //cookie_manager_h diff --git a/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.h b/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.h index dfdec4a..a4b324d 100644 --- a/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.h @@ -14,8 +14,9 @@ class DevToolsManagerDelegateEfl : public DevToolsManagerDelegate { DevToolsManagerDelegateEfl(); ~DevToolsManagerDelegateEfl() override; - private: - // DISALLOW_COPY_AND_ASSIGN(DevToolsManagerDelegateEfl); + DevToolsManagerDelegateEfl(const DevToolsManagerDelegateEfl&) = delete; + DevToolsManagerDelegateEfl& operator=(const DevToolsManagerDelegateEfl&) = + delete; }; } // namespace content diff --git a/tizen_src/ewk/efl_integration/ewk_global_data.h b/tizen_src/ewk/efl_integration/ewk_global_data.h index 8f675d6..8249caa 100644 --- a/tizen_src/ewk/efl_integration/ewk_global_data.h +++ b/tizen_src/ewk/efl_integration/ewk_global_data.h @@ -43,6 +43,9 @@ class EwkGlobalData EwkGlobalData(); ~EwkGlobalData(); + EwkGlobalData(const EwkGlobalData&) = delete; + EwkGlobalData& operator=(const EwkGlobalData&) = delete; + static EwkGlobalData* instance_; #if defined(USE_OZONE) @@ -62,8 +65,6 @@ class EwkGlobalData std::unique_ptr browser_main_runner_; scoped_refptr system_request_context_; - - // DISALLOW_COPY_AND_ASSIGN(EwkGlobalData); }; #endif // EWK_GLOBAL_DATA_H_ diff --git a/tizen_src/ewk/efl_integration/http_user_agent_settings_efl.h b/tizen_src/ewk/efl_integration/http_user_agent_settings_efl.h index 264aeb0..e91e9cd 100644 --- a/tizen_src/ewk/efl_integration/http_user_agent_settings_efl.h +++ b/tizen_src/ewk/efl_integration/http_user_agent_settings_efl.h @@ -17,12 +17,12 @@ class HttpUserAgentSettingsEfl : public net::HttpUserAgentSettings { HttpUserAgentSettingsEfl(); ~HttpUserAgentSettingsEfl() override; + HttpUserAgentSettingsEfl(const HttpUserAgentSettingsEfl&) = delete; + HttpUserAgentSettingsEfl& operator=(const HttpUserAgentSettingsEfl&) = delete; + // HttpUserAgentSettings implementation std::string GetAcceptLanguage() const override; std::string GetUserAgent() const override; - - private: - // DISALLOW_COPY_AND_ASSIGN(HttpUserAgentSettingsEfl); }; #endif // HTTP_USER_AGENT_SETTINGS_EFL_H_ diff --git a/tizen_src/ewk/efl_integration/permission_controller_delegate_efl.h b/tizen_src/ewk/efl_integration/permission_controller_delegate_efl.h index 6fef9e9..9037965 100644 --- a/tizen_src/ewk/efl_integration/permission_controller_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/permission_controller_delegate_efl.h @@ -23,6 +23,11 @@ class CONTENT_EXPORT PermissionControllerDelegateEfl : public PermissionControll PermissionControllerDelegateEfl(); ~PermissionControllerDelegateEfl() override; + PermissionControllerDelegateEfl(const PermissionControllerDelegateEfl&) = + delete; + PermissionControllerDelegateEfl& operator=( + const PermissionControllerDelegateEfl&) = delete; + void RequestPermission(PermissionType permission, RenderFrameHost* render_frame_host, const GURL& requesting_origin, @@ -85,8 +90,6 @@ class CONTENT_EXPORT PermissionControllerDelegateEfl : public PermissionControll PendingRequestsMap pending_requests_; base::WeakPtrFactory weak_ptr_factory_; - - // DISALLOW_COPY_AND_ASSIGN(PermissionControllerDelegateEfl); }; } diff --git a/tizen_src/ewk/efl_integration/private/ewk_context_private.h b/tizen_src/ewk/efl_integration/private/ewk_context_private.h index 7bd8373..2d29d69 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_context_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_context_private.h @@ -139,9 +139,11 @@ struct Ewk_Context : public base::RefCounted { Ewk_Context(bool incognito); Ewk_Context(const std::string& injectedBundlePath); ~Ewk_Context(); - friend class base::RefCounted; - // DISALLOW_COPY_AND_ASSIGN(Ewk_Context); + Ewk_Context(const Ewk_Context&) = delete; + Ewk_Context& operator=(const Ewk_Context&) = delete; + + friend class base::RefCounted; }; diff --git a/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.h b/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.h index 55ccb87..b61a99e 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.h @@ -21,6 +21,9 @@ class _Ewk_Hit_Test { explicit _Ewk_Hit_Test(const Hit_Test_Params& params); ~_Ewk_Hit_Test(); + _Ewk_Hit_Test(const _Ewk_Hit_Test&) = delete; + _Ewk_Hit_Test& operator=(const _Ewk_Hit_Test&) = delete; + Ewk_Hit_Test_Result_Context GetResultContext() const; const char* GetLinkUri() const; @@ -51,12 +54,12 @@ class _Ewk_Hit_Test { explicit Hit_Test_Node_Data(const Hit_Test_Params::Node_Data& data); ~Hit_Test_Node_Data(); + Hit_Test_Node_Data(const Hit_Test_Node_Data&) = delete; + Hit_Test_Node_Data& operator=(const Hit_Test_Node_Data&) = delete; + const std::string tagName; // tag name for hit element const std::string nodeValue; // node value for hit element - Eina_Hash* attributeHash; // attribute data for hit element - - private: - // DISALLOW_COPY_AND_ASSIGN(Hit_Test_Node_Data); + Eina_Hash* attributeHash; // attribute data for hit element } nodeData; // when hit node is image we need to store image buffer and filename extension @@ -64,14 +67,12 @@ class _Ewk_Hit_Test { public: explicit Hit_Test_Image_Buffer(const Hit_Test_Params::Image_Data& data); - const std::string fileNameExtension; // image filename extension for hit element - SkBitmap imageBitmap; // image pixels data + Hit_Test_Image_Buffer(const Hit_Test_Image_Buffer&) = delete; + Hit_Test_Image_Buffer& operator=(const Hit_Test_Image_Buffer&) = delete; - private: - // DISALLOW_COPY_AND_ASSIGN(Hit_Test_Image_Buffer); + const std::string fileNameExtension; // image filename extension for hit element + SkBitmap imageBitmap; // image pixels data } imageData; - - // DISALLOW_COPY_AND_ASSIGN(_Ewk_Hit_Test); }; diff --git a/tizen_src/ewk/efl_integration/private/ewk_notification_private.h b/tizen_src/ewk/efl_integration/private/ewk_notification_private.h index c9c9bd2..80bd08a 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_notification_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_notification_private.h @@ -25,6 +25,9 @@ struct Ewk_Notification { const GURL& securityOrigin); ~Ewk_Notification(); + Ewk_Notification(const Ewk_Notification&) = delete; + Ewk_Notification& operator=(const Ewk_Notification&) = delete; + const char* GetBody() const; const char* GetTitle() const; bool IsSilent() const; @@ -40,8 +43,6 @@ struct Ewk_Notification { bool silent_; uint64_t notificationID_; std::unique_ptr<_Ewk_Security_Origin> origin_; - - // DISALLOW_COPY_AND_ASSIGN(Ewk_Notification); }; struct Ewk_Notification_Permission_Request { @@ -51,6 +52,11 @@ struct Ewk_Notification_Permission_Request { const GURL& source_origin); ~Ewk_Notification_Permission_Request() {} + Ewk_Notification_Permission_Request( + const Ewk_Notification_Permission_Request&) = delete; + Ewk_Notification_Permission_Request& operator=( + const Ewk_Notification_Permission_Request&) = delete; + const _Ewk_Security_Origin* GetSecurityOrigin() const; bool IsDecided() const; bool IsSuspended() const; @@ -62,8 +68,6 @@ struct Ewk_Notification_Permission_Request { base::OnceCallback callback_; bool decided_; mutable bool suspended_; - - // DISALLOW_COPY_AND_ASSIGN(Ewk_Notification_Permission_Request); }; diff --git a/tizen_src/ewk/efl_integration/private/ewk_quota_permission_request_private.h b/tizen_src/ewk/efl_integration/private/ewk_quota_permission_request_private.h index c79d656..0c84563 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_quota_permission_request_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_quota_permission_request_private.h @@ -15,6 +15,10 @@ struct _Ewk_Quota_Permission_Request { public: _Ewk_Quota_Permission_Request(const GURL& url, int64_t newQuota, bool isPersistent); + _Ewk_Quota_Permission_Request(const _Ewk_Quota_Permission_Request&) = delete; + _Ewk_Quota_Permission_Request& operator=( + const _Ewk_Quota_Permission_Request) = delete; + void setView(Evas_Object* view); Evas_Object* getView() const; Eina_Stringshare* GetHost() const; @@ -30,8 +34,6 @@ struct _Ewk_Quota_Permission_Request { int64_t newQuota_; bool isPersistent_; Evas_Object* view_; - - // DISALLOW_COPY_AND_ASSIGN(_Ewk_Quota_Permission_Request); }; #endif // EWK_QUOTA_PERMISSION_REQUEST_PRIVATE_H diff --git a/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.h b/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.h index 7462b51..261a5ac 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.h @@ -20,6 +20,9 @@ struct _Ewk_Security_Origin _Ewk_Security_Origin(const GURL& url); ~_Ewk_Security_Origin(); + _Ewk_Security_Origin(const _Ewk_Security_Origin&) = delete; + _Ewk_Security_Origin& operator=(const _Ewk_Security_Origin&) = delete; + GURL GetURL() const; Eina_Stringshare* GetHost() const; Eina_Stringshare* GetProtocol() const; @@ -32,8 +35,6 @@ struct _Ewk_Security_Origin const Eina_Stringshare* host_; const Eina_Stringshare* protocol_; const int port_; - - // DISALLOW_COPY_AND_ASSIGN(_Ewk_Security_Origin); }; #endif // ewk_security_origin_private_h diff --git a/tizen_src/ewk/efl_integration/private/ewk_view_private.cc b/tizen_src/ewk/efl_integration/private/ewk_view_private.cc index 498c01a..87f2db6 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_view_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_view_private.cc @@ -15,11 +15,14 @@ struct EwkViewImpl { explicit EwkViewImpl(EWebView* wv) : wv_(wv) {} ~EwkViewImpl() { delete(wv_); } + + EwkViewImpl(const EwkViewImpl&) = delete; + EwkViewImpl& operator=(const EwkViewImpl&) = delete; + EWebView* GetTizenWebView() { return wv_; } const EWebView* GetTizenWebView() const { return wv_; } private: EWebView* wv_; - // DISALLOW_COPY_AND_ASSIGN(EwkViewImpl); }; Evas_Smart_Class parent_smart_class_ = EVAS_SMART_CLASS_INIT_NULL; diff --git a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h index 010551a..0f4de1c 100644 --- a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h +++ b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h @@ -30,7 +30,9 @@ struct WebViewDelegateEwk { void RequestHandleOrientationUnlock(EWebView* wv) const; private: WebViewDelegateEwk() {} - // DISALLOW_COPY_AND_ASSIGN(WebViewDelegateEwk); + + WebViewDelegateEwk(const WebViewDelegateEwk&) = delete; + WebViewDelegateEwk& operator=(const WebViewDelegateEwk&) = delete; }; diff --git a/tizen_src/ewk/efl_integration/renderer/content_settings_client_efl.h b/tizen_src/ewk/efl_integration/renderer/content_settings_client_efl.h index e3d3918..5bcf27a 100644 --- a/tizen_src/ewk/efl_integration/renderer/content_settings_client_efl.h +++ b/tizen_src/ewk/efl_integration/renderer/content_settings_client_efl.h @@ -16,14 +16,14 @@ class ContentSettingsClientEfl : public RenderFrameObserver, explicit ContentSettingsClientEfl(RenderFrame* render_view); ~ContentSettingsClientEfl() override; + ContentSettingsClientEfl(const ContentSettingsClientEfl&) = delete; + ContentSettingsClientEfl& operator=(const ContentSettingsClientEfl&) = delete; + // content::RenderFrameObserver implementation. void OnDestruct() override; // blink::WebContentSettingsClient implementation. void DidNotAllowScript() override; - - private: - // DISALLOW_COPY_AND_ASSIGN(ContentSettingsClientEfl); }; } // namespace content diff --git a/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.h b/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.h index 9f94147..f931723 100644 --- a/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.h +++ b/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.h @@ -25,11 +25,12 @@ class PluginPlaceholderEfl : public plugins::LoadablePluginPlaceholder, const std::string& html_data); ~PluginPlaceholderEfl() override; + PluginPlaceholderEfl(const PluginPlaceholderEfl&) = delete; + PluginPlaceholderEfl& operator=(const PluginPlaceholderEfl&) = delete; + // WebViewPlugin::Delegate (via PluginPlaceholder) method v8::Local GetV8Handle(v8::Isolate*) override; blink::WebPlugin* CreatePlugin() override; - - // DISALLOW_COPY_AND_ASSIGN(PluginPlaceholderEfl); }; #endif // PLUGIN_PLACEHOLDER_EFL_H_ diff --git a/tizen_src/ewk/efl_integration/shared_url_loader_factory_efl.h b/tizen_src/ewk/efl_integration/shared_url_loader_factory_efl.h index 2224851..2190f68 100644 --- a/tizen_src/ewk/efl_integration/shared_url_loader_factory_efl.h +++ b/tizen_src/ewk/efl_integration/shared_url_loader_factory_efl.h @@ -50,13 +50,15 @@ class SharedURLLoaderFactoryEfl : public network::SharedURLLoaderFactory { friend class base::RefCounted; ~SharedURLLoaderFactoryEfl() override = default; + SharedURLLoaderFactoryEfl(const SharedURLLoaderFactoryEfl&) = delete; + SharedURLLoaderFactoryEfl& operator=(const SharedURLLoaderFactoryEfl&) = + delete; + // NetworkContext using the network service, if the network service is // enabled. mojo::NullRemote(), otherwise. mojo::Remote network_service_network_context_; mojo::Remote url_loader_factory_; - - // DISALLOW_COPY_AND_ASSIGN(SharedURLLoaderFactoryEfl); }; /* LCOV_EXCL_STOP */ diff --git a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h index ab86706..111a753 100644 --- a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h +++ b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h @@ -60,6 +60,10 @@ class URLRequestContextGetterEfl : public net::URLRequestContextGetter { protected: virtual ~URLRequestContextGetterEfl(); + URLRequestContextGetterEfl(const URLRequestContextGetterEfl&) = delete; + URLRequestContextGetterEfl& operator=(const URLRequestContextGetterEfl&) = + delete; + private: void CreateSQLitePersistentCookieStore( const base::FilePath& path, @@ -84,8 +88,6 @@ class URLRequestContextGetterEfl : public net::URLRequestContextGetter { std::unique_ptr cert_verifier_; std::unique_ptr url_request_context_; base::WeakPtrFactory weak_ptr_factory_; - - // DISALLOW_COPY_AND_ASSIGN(URLRequestContextGetterEfl); }; }; // namespace content diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h index 51a7eeb..a50a0c9 100644 --- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h @@ -34,6 +34,9 @@ class WebContentsDelegateEfl : public WebContentsDelegate, WebContentsDelegateEfl(EWebView*); ~WebContentsDelegateEfl() override; + WebContentsDelegateEfl(const WebContentsDelegateEfl&) = delete; + WebContentsDelegateEfl& operator=(const WebContentsDelegateEfl&) = delete; + // WebContentsDelegate overrides. WebContents* OpenURLFromTab(WebContents* source, const OpenURLParams& params) override; @@ -233,8 +236,6 @@ class WebContentsDelegateEfl : public WebContentsDelegate, base::WeakPtrFactory weak_ptr_factory_; std::unique_ptr<_Ewk_Certificate_Policy_Decision> certificate_policy_decision_; - - // DISALLOW_COPY_AND_ASSIGN(WebContentsDelegateEfl); }; } diff --git a/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.h b/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.h index 0377cff..98065a1 100644 --- a/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.h +++ b/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.h @@ -13,6 +13,10 @@ class WebContentsEflDelegateEwk : public content::WebContentsEflDelegate { public: WebContentsEflDelegateEwk(EWebView*); + WebContentsEflDelegateEwk(const WebContentsEflDelegateEwk&) = delete; + WebContentsEflDelegateEwk& operator=(const WebContentsEflDelegateEwk&) = + delete; + bool WebContentsCreateAsync(WebContentsCreateCallback) override; void SetUpSmartObject(void*platform_data, void* native_view) override; @@ -43,8 +47,6 @@ class WebContentsEflDelegateEwk : public content::WebContentsEflDelegate { private: EWebView* web_view_; - - // DISALLOW_COPY_AND_ASSIGN(WebContentsEflDelegateEwk); }; #endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_EFL_DELEGATE_EWK_H_ diff --git a/tizen_src/ewk/efl_integration/wrt/wrt_dynamicplugin.h b/tizen_src/ewk/efl_integration/wrt/wrt_dynamicplugin.h index 59e3af1..7653e12 100644 --- a/tizen_src/ewk/efl_integration/wrt/wrt_dynamicplugin.h +++ b/tizen_src/ewk/efl_integration/wrt/wrt_dynamicplugin.h @@ -52,12 +52,13 @@ class WrtDynamicPlugin : public DynamicPlugin { private: WrtDynamicPlugin(); + WrtDynamicPlugin(const WrtDynamicPlugin&) = delete; + WrtDynamicPlugin& operator=(const WrtDynamicPlugin&) = delete; + ParseUrlFun parseURL_; SetWidgetInfoFun set_widget_info_; DatabaseAttachFun database_attach_; OnIPCMessageFun on_IPC_message_; - - // DISALLOW_COPY_AND_ASSIGN(WrtDynamicPlugin); }; #endif // EWK_EFL_INTEGRATION_WRT_WRT_DYNAMICPLUGIN_H_ diff --git a/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.h b/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.h index 251c018..ed2f7a9 100644 --- a/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.h +++ b/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.h @@ -26,6 +26,9 @@ class WrtFileProtocolHandler : public URLRequestJobFactory::ProtocolHandler { : file_task_runner_(file_task_runner) {} ~WrtFileProtocolHandler() override {} + WrtFileProtocolHandler(const WrtFileProtocolHandler&) = delete; + WrtFileProtocolHandler& operator=(const WrtFileProtocolHandler&) = delete; + std::unique_ptr CreateJob(URLRequest* request) const override; bool IsSafeRedirectTarget(const GURL& location) const override { return false; @@ -35,7 +38,6 @@ class WrtFileProtocolHandler : public URLRequestJobFactory::ProtocolHandler { bool GetWrtParsedUrl(const GURL& url, GURL& parsed_url) const; const scoped_refptr file_task_runner_; - // DISALLOW_COPY_AND_ASSIGN(WrtFileProtocolHandler); }; } // namespace net diff --git a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.h b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.h index 1fe575c..903c1aa 100644 --- a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.h +++ b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.h @@ -41,13 +41,14 @@ class WrtWidgetHost { WrtWidgetHost(); + WrtWidgetHost(const WrtWidgetHost&) = delete; + WrtWidgetHost& operator=(const WrtWidgetHost&) = delete; + void OnUrlRetrieved(int callback_id, const GURL& url); scoped_refptr message_filter_; base::AtomicSequenceNumber callback_id_generator_; callbacks_type callbacks_; - - // DISALLOW_COPY_AND_ASSIGN(WrtWidgetHost); };