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/fpdfxfa/cpdfxfa_context.h | |
| 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/fpdfxfa/cpdfxfa_context.h')
| -rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_context.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.h b/fpdfsdk/fpdfxfa/cpdfxfa_context.h index a0f90ab37b..0dbc51e54b 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h @@ -10,9 +10,9 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_observable.h" #include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/observable.h" #include "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h" #include "fpdfsdk/fpdfxfa/cpdfxfa_page.h" #include "xfa/fxfa/cxfa_ffdoc.h" @@ -104,7 +104,7 @@ class CPDFXFA_Context : public IXFA_AppProvider { XFA_DocType m_iDocType; std::unique_ptr<CPDF_Document> m_pPDFDoc; std::unique_ptr<CXFA_FFDoc> m_pXFADoc; - CFX_Observable<CPDFSDK_FormFillEnvironment>::ObservedPtr m_pFormFillEnv; + Observable<CPDFSDK_FormFillEnvironment>::ObservedPtr m_pFormFillEnv; CFX_UnownedPtr<CXFA_FFDocView> m_pXFADocView; std::unique_ptr<CXFA_FFApp> m_pXFAApp; std::unique_ptr<CJS_Runtime> m_pRuntime; |