Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / common / adaptor-impl.h

diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h
old mode 100644 (file)
new mode 100755 (executable)
index 2476136..5588cd8
--- a/dali/internal/adaptor/common/adaptor-impl.h
+++ b/dali/internal/adaptor/common/adaptor-impl.h
@@ -28,9 +28,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/adaptor.h>
-#include <dali/devel-api/adaptor-framework/render-surface.h>
 #include <dali/public-api/adaptor-framework/tts-player.h>
-#include <dali/devel-api/adaptor-framework/imf-manager.h>
 #include <dali/devel-api/adaptor-framework/clipboard.h>
 
 #include <dali/internal/legacy/common/tizen-platform-abstraction.h>
@@ -48,11 +46,6 @@
 namespace Dali
 {
 
-namespace Accessibility
-{
-class Bridge;
-}
-
 class RenderSurface;
 class Window;
 
@@ -608,18 +601,8 @@ private: // Data
   SocketFactory                         mSocketFactory;               ///< Socket factory
   const bool                            mEnvironmentOptionsOwned:1;   ///< Whether we own the EnvironmentOptions (and thus, need to delete it)
   bool                                  mUseRemoteSurface;            ///< whether the remoteSurface is used or not
-
-  class AccessibilityObserver : public ConnectionTracker
-  {
-  public:
-    std::shared_ptr< Dali::Accessibility::Bridge > atspiBridge;
-
-    void OnAccessibleKeyEvent( const KeyEvent& event );
-  };
-  AccessibilityObserver accessibilityObserver;
-
 public:
-  inline static Adaptor& GetImplementation(Dali::Adaptor& adaptor) { return *adaptor.mImpl; }
+  inline static Adaptor& GetImplementation(Dali::Adaptor& adaptor) {return *adaptor.mImpl;}
 };
 
 } // namespace Internal