X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fubuntu-x11%2Fwindow-factory-ecore-x.cpp;fp=dali%2Finternal%2Fwindow-system%2Fubuntu-x11%2Fwindow-base-factory-ecore-x.cpp;h=2a9d086c3f62258a89f8394e1232b76e53a3e421;hp=6b59782ea004dfc3cbed27fb8d0389ac7cc80a35;hb=44ac6b074a4d7d2f9474331a364e4629c0bce11a;hpb=969eba3fde5242ccfdef562bb3dd21712ff9df9b diff --git a/dali/internal/window-system/ubuntu-x11/window-base-factory-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/window-factory-ecore-x.cpp similarity index 61% rename from dali/internal/window-system/ubuntu-x11/window-base-factory-ecore-x.cpp rename to dali/internal/window-system/ubuntu-x11/window-factory-ecore-x.cpp index 6b59782..2a9d086 100644 --- a/dali/internal/window-system/ubuntu-x11/window-base-factory-ecore-x.cpp +++ b/dali/internal/window-system/ubuntu-x11/window-factory-ecore-x.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL HEADERS #include @@ -29,16 +29,21 @@ namespace Internal namespace Adaptor { -std::unique_ptr< Dali::Internal::Adaptor::WindowBase > WindowBaseFactoryEcoreX::CreateWindowBase( Window* window, WindowRenderSurface* windowRenderSurface ) +std::unique_ptr< WindowBase > WindowFactoryEcoreX::CreateWindowBase( Window* window, WindowRenderSurface* windowRenderSurface ) { return Utils::MakeUnique< WindowBaseEcoreX >( window, windowRenderSurface ); } -// this should be created from somewhere -std::unique_ptr< WindowBaseFactory > GetWindowBaseFactory() +std::unique_ptr< IndicatorInterface > WindowFactoryEcoreX::CreateIndicator( Adaptor* adaptor, Dali::Window::WindowOrientation orientation, IndicatorInterface::Observer* observer ) { - // returns WindowBase factory - return Utils::MakeUnique< WindowBaseFactoryEcoreX >(); + return std::unique_ptr< IndicatorInterface >( nullptr ); +} + +// this should be created from Window impl +std::unique_ptr< WindowFactory > GetWindowFactory() +{ + // returns Window factory + return Utils::MakeUnique< WindowFactoryEcoreX >(); } } // namespace Adaptor