diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 15:25:32 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 19:41:49 +0000 |
| commit | 65ecca4bc9c8e043b355c459486870ac1518095d (patch) | |
| tree | 2cca0a32a7873f2743e9d927010533019e4c85b9 /fpdfsdk/pwl | |
| parent | 3418f710f923785a0fd05f7c556d09bc9a8d3447 (diff) | |
| download | pdfium-65ecca4bc9c8e043b355c459486870ac1518095d.tar.xz | |
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 <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/pwl')
| -rw-r--r-- | fpdfsdk/pwl/cpwl_wnd.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/pwl/cpwl_wnd.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp index 4e4abd2017..9abe03c3fb 100644 --- a/fpdfsdk/pwl/cpwl_wnd.cpp +++ b/fpdfsdk/pwl/cpwl_wnd.cpp @@ -46,7 +46,7 @@ CPWL_Wnd::CreateParams::CreateParams(const CreateParams& other) = default; CPWL_Wnd::CreateParams::~CreateParams() = default; -class CPWL_MsgControl : public CFX_Observable<CPWL_MsgControl> { +class CPWL_MsgControl : public Observable<CPWL_MsgControl> { friend class CPWL_Wnd; public: 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 <vector> #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<CPWL_Wnd> { +class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> { public: class PrivateData { protected: ~PrivateData() {} }; - class ProviderIface : public CFX_Observable<ProviderIface> { + class ProviderIface : public Observable<ProviderIface> { public: virtual ~ProviderIface() {} |