From aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Thu, 21 Sep 2017 16:53:58 -0400
Subject: Move CFX_UnownedPtr to UnownedPtr

This CL moves CFX_UnownedPtr to UnownedPtr and places in the fxcrt
namespace.

Bug: pdfium:898
Change-Id: I6d1fa463f365e5cb3aafa8c8a7a5f7eff62ed8e0
Reviewed-on: https://pdfium-review.googlesource.com/14620
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 fpdfsdk/pwl/cpwl_wnd.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'fpdfsdk/pwl/cpwl_wnd.h')

diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index ecef1e2e10..11b62b337c 100644
--- a/fpdfsdk/pwl/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "core/fpdfdoc/cpdf_formcontrol.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/observable.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/cfx_color.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_widget.h"
@@ -131,7 +131,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> {
     CFX_SystemHandler* pSystemHandler;                // required
     IPVT_FontMap* pFontMap;                           // required
     ProviderIface::ObservedPtr pProvider;             // required
-    CFX_UnownedPtr<FocusHandlerIface> pFocusHandler;  // optional
+    UnownedPtr<FocusHandlerIface> pFocusHandler;      // optional
     uint32_t dwFlags;                                 // optional
     CFX_Color sBackgroundColor;                       // optional
     CPDFSDK_Widget::ObservedPtr pAttachedWidget;      // required
@@ -142,7 +142,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> {
     int32_t nTransparency;                            // optional
     float fFontSize;                                  // optional
     CPWL_Dash sDash;                                  // optional
-    CFX_UnownedPtr<PrivateData> pAttachedData;        // optional
+    UnownedPtr<PrivateData> pAttachedData;            // optional
     CPWL_Wnd* pParentWnd;                             // ignore
     CPWL_MsgControl* pMsgControl;                     // ignore
     int32_t eCursorType;                              // ignore
@@ -311,7 +311,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> {
 
   CreateParams m_CreationParams;
   std::vector<CPWL_Wnd*> m_Children;
-  CFX_UnownedPtr<CPWL_ScrollBar> m_pVScrollBar;
+  UnownedPtr<CPWL_ScrollBar> m_pVScrollBar;
   CFX_FloatRect m_rcWindow;
   CFX_FloatRect m_rcClip;
   bool m_bCreated;
-- 
cgit v1.2.3