From 65ecca4bc9c8e043b355c459486870ac1518095d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 21 Sep 2017 15:25:32 -0400 Subject: Move CFX_Observable to Observable This CL renames CFX_Observable to Observable and moves into the fxcrt namespace. The test suite names were updated to ObservedPtr from fxcrt. Bug: pdfium:898 Change-Id: Ia507482bc0a1d6d8bbf12c0c55c4a88f6c8910e2 Reviewed-on: https://pdfium-review.googlesource.com/14615 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- fpdfsdk/pwl/cpwl_wnd.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/pwl/cpwl_wnd.h') diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h index 17ed06450a..ecef1e2e10 100644 --- a/fpdfsdk/pwl/cpwl_wnd.h +++ b/fpdfsdk/pwl/cpwl_wnd.h @@ -11,8 +11,8 @@ #include #include "core/fpdfdoc/cpdf_formcontrol.h" -#include "core/fxcrt/cfx_observable.h" #include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/observable.h" #include "core/fxge/cfx_color.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" @@ -100,14 +100,14 @@ inline bool operator!=(const CFX_Color& c1, const CFX_Color& c2) { #define PWL_DEFAULT_BLACKCOLOR CFX_Color(COLORTYPE_GRAY, 0) #define PWL_DEFAULT_WHITECOLOR CFX_Color(COLORTYPE_GRAY, 1) -class CPWL_Wnd : public CPWL_TimerHandler, public CFX_Observable { +class CPWL_Wnd : public CPWL_TimerHandler, public Observable { public: class PrivateData { protected: ~PrivateData() {} }; - class ProviderIface : public CFX_Observable { + class ProviderIface : public Observable { public: virtual ~ProviderIface() {} -- cgit v1.2.3