xfa/src/fwl/src/basewidget/include/fwl_editimp.h - Issue 1545183002: Merge to XFA: Switch from nonstd::unique_ptr to std::unique_ptr.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: xfa/src/fwl/src/basewidget/include/fwl_editimp.h

Issue 1545183002: Merge to XFA: Switch from nonstd::unique_ptr to std::unique_ptr. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: xfa Created 5 years 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

« core/include/fxcodec/fx_codec.h ('K') | « xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h ('k') | xfa/src/fwl/src/basewidget/include/fwl_listboximp.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: xfa/src/fwl/src/basewidget/include/fwl_editimp.h

diff --git a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h

index 1a610c74b0e109f490b63076a342bdac051dd7ea..650523cf166d5820bfe5e815f4c9f18a82c2b762 100644

--- a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h

+++ b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h

@@ -7,7 +7,7 @@

#ifndef _FWL_EDIT_IMP_H

#define _FWL_EDIT_IMP_H

-#include "third_party/base/nonstd_unique_ptr.h"

+#include <memory>

class CFWL_WidgetImp;

class CFWL_WidgetImpProperties;

@@ -164,9 +164,9 @@ class CFWL_EditImp : public CFWL_WidgetImp, public IFDE_TxtEdtEventSink {

FX_BOOL m_bSetRange;

int32_t m_iMin;

int32_t m_iMax;

- nonstd::unique_ptr<IFWL_ScrollBar> m_pVertScrollBar;

- nonstd::unique_ptr<IFWL_ScrollBar> m_pHorzScrollBar;

- nonstd::unique_ptr<IFWL_Caret> m_pCaret;

+ std::unique_ptr<IFWL_ScrollBar> m_pVertScrollBar;

+ std::unique_ptr<IFWL_ScrollBar> m_pHorzScrollBar;

+ std::unique_ptr<IFWL_Caret> m_pCaret;

CFX_WideString m_wsCache;

friend class CFWL_TxtEdtEventSink;

friend class CFWL_EditImpDelegate;