[NextBrowser] Reverting 'Applied new IME UI(Dynamic UI) repositioned new IME.'

commit ID: f620b446ecd25257103ed8d993b18d6e38c336c5

Change-Id: Ia1be71703add11ab0e9585f2cc7cfc4d98d6c0d5
Signed-off-by: Tarun Verma <tarun1.verma@samsung.com>

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc
index f8af134a8fb52ac4f082a1f92d3877c9c1f21359..bd36e84bd07bc8094cd9953b4341b9652f75f5d6 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc
@@ -835,11 +835,7 @@ ui::ImeStyle RWHVAuraCommonHelperEfl::GetImeStyle() {
       return ime_style;
     }
   }
-#if defined(SAMSUNG_NEXT_BROWSER)
-  return ui::ImeStyle::IME_STYLE_DYNAMIC;
-#else
   return ui::ImeStyle::IME_STYLE_FULL;
-#endif  // SAMSUNG_NEXT_BROWSER
 }
 
 bool RWHVAuraCommonHelperEfl::HasFocusedTextInputClient(

diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_aura_helper_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_aura_helper_efl.cc
index 6977b3146b4ac63c17f4f6b959f4db290898a631..0379efd24d9ffc1012f37e965101a13af2ff895e 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_aura_helper_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_aura_helper_efl.cc
@@ -188,11 +188,7 @@ void WebContentsViewAuraHelperEfl::OnOverscrolled(
 ui::ImeStyle WebContentsViewAuraHelperEfl::GetImeStyle() const {
   if (webview_delegate_)
     return webview_delegate_->GetImeStyle();
-#if defined(SAMSUNG_NEXT_BROWSER)
-  return ui::ImeStyle::IME_STYLE_DYNAMIC;
-#else
   return ui::ImeStyle::IME_STYLE_FULL;
-#endif  // SAMSUNG_NEXT_BROWSER
 }
 
 bool WebContentsViewAuraHelperEfl::UseKeyPadWithoutUserAction() const {

diff --git a/tizen_src/chromium_impl/ui/ozone/platform/efl/efl_input_method_context.cc b/tizen_src/chromium_impl/ui/ozone/platform/efl/efl_input_method_context.cc
index 51b6a68d5bf041db4863a5ef0ea4e8929b971ace..66dd534000026cf0e6aaab2a4c5cd79291ca8a30 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/platform/efl/efl_input_method_context.cc
+++ b/tizen_src/chromium_impl/ui/ozone/platform/efl/efl_input_method_context.cc
@@ -56,12 +56,8 @@ void EflInputMethodContext::UpdateFocus(
     TextInputType old_type,
     const TextInputClientAttributes& new_client_attributes,
     TextInputClient::FocusReason reason) {
-  if (im_context_) {
+  if (im_context_)
     im_context_->UpdateInputMethodState(new_client_attributes);
-#if defined(SAMSUNG_NEXT_BROWSER)
-    im_context_->SetIMEPositionAlign(500, 550, IME_ALIGN_TOP_LEFT);
-#endif
-  }
   if (old_type != TEXT_INPUT_TYPE_NONE &&
       new_client_attributes.input_type == TEXT_INPUT_TYPE_NONE) {
     Blur();

diff --git a/tizen_src/chromium_impl/ui/ozone/platform/efl/im_context_efl.cc b/tizen_src/chromium_impl/ui/ozone/platform/efl/im_context_efl.cc
index e99b3685eba3232dd44ab0557c43bd2096d809c9..63a9b222e49043be3cd4263556ca33525efdfb24 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/platform/efl/im_context_efl.cc
+++ b/tizen_src/chromium_impl/ui/ozone/platform/efl/im_context_efl.cc
@@ -328,13 +328,10 @@ void IMContextEfl::UpdateInputMethodType(TextInputType type,
   if (ime_style_ == ImeStyle::IME_STYLE_FLOATING) {
     LOG(INFO) << "set floating_ui";
     im_data.append("&action=floating_ui");
-  }
-#if !defined(SAMSUNG_NEXT_BROWSER)
-  else if (ime_style_ == ImeStyle::IME_STYLE_DYNAMIC) {
+  } else if (ime_style_ == ImeStyle::IME_STYLE_DYNAMIC) {
     LOG(INFO) << "set dynamic_ui";
     im_data.append("&action=dynamic_ui");
   }
-#endif
   ecore_imf_context_input_panel_imdata_set(context_, im_data.c_str(),
                                            im_data.length());
 

diff --git a/tizen_src/ewk/efl_integration/private/ewk_settings_private.h b/tizen_src/ewk/efl_integration/private/ewk_settings_private.h
index a9049b9195b056e6a29908670726d144a96af579..b9a8b36632e3c5a7963f57319b7a406f8cd7658e 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_settings_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_settings_private.h
@@ -142,11 +142,7 @@ class Ewk_Settings {
     bool m_createSelectMenuByClient = false;
     bool m_clipboardEnabled = false;
     bool m_imeHandleKeyEventEnabled = true;
-#if defined(SAMSUNG_NEXT_BROWSER)
-    Ewk_Ime_Style m_ime_style = IME_STYLE_DYNAMIC;
-#else
     Ewk_Ime_Style m_ime_style = IME_STYLE_FULL;
-#endif  // SAMSUNG_NEXT_BROWSER
 };
 
 #endif // ewk_settings_private_h

diff --git a/ui/base/ime/linux/linux_input_method_context.h b/ui/base/ime/linux/linux_input_method_context.h
index 08c577a18af829dde6e3a175c2308d27bd0a9c3f..cbe9e15e41c68beeebab08a9637714a329047b44 100644 (file)
--- a/ui/base/ime/linux/linux_input_method_context.h
+++ b/ui/base/ime/linux/linux_input_method_context.h
@@ -48,11 +48,7 @@ class COMPONENT_EXPORT(UI_BASE_IME_LINUX) LinuxInputMethodContext {
 #if BUILDFLAG(IS_TIZEN_TV)
     int password_input_minlength = -1;
     int input_maxlength = -1;
-#if defined(SAMSUNG_NEXT_BROWSER)
-    ImeStyle ime_style = ImeStyle::IME_STYLE_DYNAMIC;
-#else
     ImeStyle ime_style = ImeStyle::IME_STYLE_FULL;
-#endif  // SAMSUNG_NEXT_BROWSER
 #endif  // IS_TIZEN_TV
 #endif  // IS_EFL
   };

diff --git a/ui/base/ime/text_input_client.cc b/ui/base/ime/text_input_client.cc
index 7aaddbdc39eabb3eead443964c1ff0e18cccbf2f..b49e5c49b1175c2b2ec3d851aa1854ea60b5c3f2 100644 (file)
--- a/ui/base/ime/text_input_client.cc
+++ b/ui/base/ime/text_input_client.cc
@@ -28,11 +28,7 @@ int TextInputClient::GetInputMaxLength() const {
 }
 
 ImeStyle TextInputClient::GetImeStyle() const {
-#if defined(SAMSUNG_NEXT_BROWSER)
-  return ImeStyle::IME_STYLE_DYNAMIC;
-#else
   return ImeStyle::IME_STYLE_FULL;
-#endif  // SAMSUNG_NEXT_BROWSER
 }
 #endif  // IS_TIZEN_TV
 #endif  // IS_EFL