[M76 Migration] Remove EWK_BRINGUP in client_native_pixmap_factory_efl.cc

Reference: https://review.tizen.org/gerrit/#/c/200795/

Change-Id: Icf7bc9d89650fa842331a15828a0b2acddf03f03
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>
(cherry picked from commit 4c0b4519a409ef83204cd5803176d609d316823d)
(cherry picked from commit 449ee01c7ee49893b6b79a67bc719d3396c7f425)

diff --git a/tizen_src/chromium_impl/ui/ozone/client_native_pixmap_factory_efl.cc b/tizen_src/chromium_impl/ui/ozone/client_native_pixmap_factory_efl.cc
index f7c3262..246a1b1 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/client_native_pixmap_factory_efl.cc
+++ b/tizen_src/chromium_impl/ui/ozone/client_native_pixmap_factory_efl.cc
@@ -9,13 +9,7 @@
 namespace ui {
 
 gfx::ClientNativePixmapFactory* CreateClientNativePixmapFactoryEfl() {
-  //#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // [m63_3239]
-  // error: cannot convert ‘gfx::ClientNativePixmapFactory*’ to
-  // ‘ui::ClientNativePixmapFactory*
   return CreateStubClientNativePixmapFactory();
-  //#endif
 }
 
 }  // namespace ui
-

diff --git a/tizen_src/chromium_impl/ui/ozone/client_native_pixmap_factory_efl.h b/tizen_src/chromium_impl/ui/ozone/client_native_pixmap_factory_efl.h
index 39b2570..82da9e4 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/client_native_pixmap_factory_efl.h
+++ b/tizen_src/chromium_impl/ui/ozone/client_native_pixmap_factory_efl.h
@@ -2,17 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef OZONE_PIXMAP_FACTORY_EFL_H_
-#define OZONE_PIXMAP_FACTORY_EFL_H_
+#ifndef UI_OZONE_CLIENT_NATIVE_PIXMAP_FACTORY_EFL_H_
+#define UI_OZONE_CLIENT_NATIVE_PIXMAP_FACTORY_EFL_H_
 
 namespace gfx {
-
 class ClientNativePixmapFactory;
+}
 
-// Constructor hook for use in constructor_list.cc
-ClientNativePixmapFactory* CreateClientNativePixmapFactoryEfl();
+namespace ui {
 
-}  // namespace gfx
+// Constructor hook for use in constructor_list.cc
+gfx::ClientNativePixmapFactory* CreateClientNativePixmapFactoryEfl();
 
-#endif  // OZONE_PIXMAP_FACTORY_EFL_H_
+}  // namespace ui
 
+#endif  // UI_OZONE_CLIENT_NATIVE_PIXMAP_FACTORY_EFL_H_