Remove EWK_BRINGUP at few places in tizen_src

This patch removes EWK_BRINGUP only in tizen_src directory so
that the changes can be permanently merged to tizen.dev branch

Change-Id: I7a7728fe9563d6855a338af1c64d0da295060d99
Signed-off-by: Gajendra N <gajendra.n@samsung.com>
(cherry picked from commit 3d11ad70ca0335ce8905522d3d6fe8e8bc6e68a5)

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
index d56e933..9028452 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
@@ -552,13 +552,12 @@ void RenderWidgetHostViewEfl::SetSize(const gfx::Size& size) {
   // This is a hack. See WebContentsView::SizeContents
   int width = std::min(size.width(), EFL_MAX_WIDTH);
   int height = std::min(size.height(), EFL_MAX_HEIGHT);
-#if !defined(EWK_BRINGUP)  // FIXME: m71 bringup
-  if (popup_type_ != blink::kWebPopupTypeNone) {
+  if (widget_type_ == WidgetType::kPopup) {
     // We're a popup, honor the size request.
     Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_);
     ecore_evas_resize(ee, width, height);
   }
-#endif
+
   // Update the size of the RWH.
   // if (requested_size_.width() != width ||
   //    requested_size_.height() != height) {

diff --git a/tizen_src/ewk/efl_integration/eweb_context.cc b/tizen_src/ewk/efl_integration/eweb_context.cc
index dd11cba..74113c7 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_context.cc
+++ b/tizen_src/ewk/efl_integration/eweb_context.cc
@@ -450,17 +450,6 @@ bool EWebContext::GetNetworkCacheEnable() const {
 #endif
 }
 
-void EWebContext::AddExtraPluginDir(const char* path) {
-#if defined(ENABLE_PLUGINS)
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // [M51_2704] The AddExtraPluginDir API was removed in content::PluginList
-  //            class. It will be fixed by webview team.
-  //            FIXME: http://suprem.sec.samsung.net/jira/browse/TWF-1132
-  content::PluginList::Singleton()->AddExtraPluginDir(base::FilePath(path));
-#endif  // EWK_BRINGUP
-#endif
-}
-
 void EWebContext::SetCertificate(const char* certificate_file) {
   browser_context_->SetCertificate(certificate_file);
 }

diff --git a/tizen_src/ewk/efl_integration/eweb_context.h b/tizen_src/ewk/efl_integration/eweb_context.h
index 83c1d16..e6f94ca 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_context.h
+++ b/tizen_src/ewk/efl_integration/eweb_context.h
@@ -91,7 +91,6 @@ class EWebContext {
 
   void ClearNetworkCache();
   void ClearWebkitCache();
-  void AddExtraPluginDir(const char *path);
   void SetCertificate(const char* certificate_file);
 
   void SetCacheModel(Ewk_Cache_Model);

diff --git a/tizen_src/ewk/efl_integration/private/ewk_context_private.cc b/tizen_src/ewk/efl_integration/private/ewk_context_private.cc
index 60f115a..ef5cd9e 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_context_private.cc
+++ b/tizen_src/ewk/efl_integration/private/ewk_context_private.cc
@@ -104,10 +104,6 @@ const char* Ewk_Context::GetProxyUri() const {
   return impl->GetProxyUri();
 }
 
-void Ewk_Context::AddExtraPluginDir(const char *path) {
-  impl->AddExtraPluginDir(path);
-}
-
 void Ewk_Context::NotifyLowMemory() {
   impl->NotifyLowMemory();
 }

diff --git a/tizen_src/ewk/efl_integration/private/ewk_context_private.h b/tizen_src/ewk/efl_integration/private/ewk_context_private.h
index 53befd0..050b60b 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_context_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_context_private.h
@@ -48,7 +48,6 @@ struct Ewk_Context : public base::RefCounted<Ewk_Context> {
   const char* GetProxyUri() const;
 
   // System
-  void AddExtraPluginDir(const char *path);
   void NotifyLowMemory();
 
   // HTTP Custom Header

diff --git a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
index 30cdb96..dcceca7 100644 (file)
--- a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
+++ b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
@@ -104,10 +104,6 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
         new net::URLRequestContextStorage(url_request_context_.get()));
     storage_->set_cookie_store(
         CreateCookieStore(CookieStoreConfig(), net_log_));
-#if !defined(EWK_BRINGUP)  // FIXME: m76 bringup
-    storage_->set_channel_id_service(base::WrapUnique(
-        new net::ChannelIDService(new net::DefaultChannelIDStore(NULL))));
-#endif
     storage_->set_http_user_agent_settings(
         base::WrapUnique(new HttpUserAgentSettingsEfl()));
 

diff --git a/tizen_src/ewk/ubrowser/window.cc b/tizen_src/ewk/ubrowser/window.cc
index f652715..254a6a0 100644 (file)
--- a/tizen_src/ewk/ubrowser/window.cc
+++ b/tizen_src/ewk/ubrowser/window.cc
@@ -462,10 +462,7 @@ void Window::On_Video_Playback_Stop(void* data,
   Window* thiz = static_cast<Window*>(data);
   char translated_url[] =
       "http://www.w3schools.com/html/mov_bbb.mp4";  // for test
-  // TODO: Once the ewk api is added, remove EWK_BRINGUP
-#if !defined(EWK_BRINGUP)
   ewk_media_translated_url_set(thiz->web_view_, translated_url);
-#endif
 }
 
 #if defined(TIZEN_TBM_SUPPORT)