[WRTjs][VD] Reduce IS_TIZEN_TV compile flag #3

Remove IS_TIZEN_TV for code readability.

Change-Id: I0cd3ebef4b9ed9bb0465de96d64d3af09bec49d6
Signed-off-by: DongHyun Song <dh81.song@samsung.com>

diff --git a/wrt/src/browser/tv/wrt_native_window_tv.h b/wrt/src/browser/tv/wrt_native_window_tv.h
index b619df6..90b7264 100644 (file)
--- a/wrt/src/browser/tv/wrt_native_window_tv.h
+++ b/wrt/src/browser/tv/wrt_native_window_tv.h
@@ -79,17 +79,17 @@ class WRTNativeWindowTV : public WRTNativeWindow {
 
  private:
   // NativeWindow:
+  void CloseImmediately() override;
+  void Focus(bool focus) override;
   void Hide() override;
+  void SetEnabled(bool enable) override;
 
   // WRTNativeWindow:
-  void CloseImmediately() override;
-  void Focus(bool focus) override;
   void OnRotation(int degree) override;
   void SetWebContents(content::WebContents* web_contents) override;
   void LowerWindow() override;
   bool IsRunningAsBackground() override;
   bool IsSameWindowId(const unsigned int window_id) override;
-  void SetEnabled(bool enable) override;
   void SetPageVisibility(bool visible) override;
   bool WillHandleConformantChange() override;
   bool ShouldHandleConformantChange() override;

diff --git a/wrt/src/browser/wrt_native_window.cc b/wrt/src/browser/wrt_native_window.cc
index fdbda4c..dd83f27 100644 (file)
--- a/wrt/src/browser/wrt_native_window.cc
+++ b/wrt/src/browser/wrt_native_window.cc
@@ -39,18 +39,14 @@
 #include "wrt/src/common/application_data.h"
 #include "wrt/src/common/wrt_profile_delegate.h"
 
-#if BUILDFLAG(IS_TIZEN_TV)
-#include "base/path_service.h"
-#include "tizen_src/chromium_impl/content/common/paths_efl.h"
-#include "wrt/src/browser/tv/wrt_native_window_tv.h"
-#endif
-
 #if defined(TIZEN_ATK_SUPPORT)
 #include "tizen_src/ewk/efl_integration/eweb_accessibility.h"
 #include "tizen_src/ewk/efl_integration/eweb_accessibility_util.h"
 #endif
 
 #if BUILDFLAG(IS_TIZEN_TV)
+#include "wrt/src/browser/tv/wrt_native_window_tv.h"
+
 using WRTNativeWindowType = wrt::WRTNativeWindowTV;
 #else
 using WRTNativeWindowType = wrt::WRTNativeWindow;
@@ -932,19 +928,11 @@ bool WRTNativeWindow::IsKiosk() {
 }
 
 void WRTNativeWindow::SetBackgroundColor(SkColor color) {
-#if BUILDFLAG(IS_TIZEN_TV)
-  content::WebContentsViewAura* aura = GetWebContentsViewAura();
-  aura->SetBackgroundColor(color);
-#endif
+  GetWebContentsViewAura()->SetBackgroundColor(color);
 }
 
 SkColor WRTNativeWindow::GetBackgroundColor() {
-#if BUILDFLAG(IS_TIZEN_TV)
-  content::WebContentsViewAura* aura = GetWebContentsViewAura();
-  return aura->GetBackgroundColor();
-#else
-  return SK_ColorWHITE;
-#endif
+  return GetWebContentsViewAura()->GetBackgroundColor();
 }
 
 void WRTNativeWindow::SetHasShadow(bool has_shadow) {