Move GetUserAgent() from ContentClientEfl to ContentBrowserClientEfl.

This change moves overriden methods GetUserAgent, GetProduct to
ContentBrowserClientEfl, as per M76 upstream.
This helps setting useragent properly in chromium-efl.

Change-Id: I2a66ca3f4dc356203ae2c0c199d06fbb261e4fe0
Signed-off-by: suyambu.rm <suyambu.rm@samsung.com>

diff --git a/tizen_src/ewk/efl_integration/common/content_client_efl.cc b/tizen_src/ewk/efl_integration/common/content_client_efl.cc
index da63c02..ac0e580 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/content_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/common/content_client_efl.cc
@@ -4,19 +4,10 @@
 
 #include "common/content_client_efl.h"
 
-#include "common/version_info.h"
 #include "ipc/ipc_message.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/l10n/l10n_util.h"
 
-std::string ContentClientEfl::GetProduct() const {
-  return EflWebView::VersionInfo::GetInstance()->ProductNameAndVersionForUserAgent();
-}
-
-std::string ContentClientEfl::GetUserAgent() const {
-  return EflWebView::VersionInfo::GetInstance()->DefaultUserAgent();
-}
-
 base::string16 ContentClientEfl::GetLocalizedString(int message_id) const {
   // TODO(boliu): Used only by WebKit, so only bundle those resources for
   // Android WebView.

diff --git a/tizen_src/ewk/efl_integration/common/content_client_efl.h b/tizen_src/ewk/efl_integration/common/content_client_efl.h
index 8d4a924..d36062e 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/content_client_efl.h
+++ b/tizen_src/ewk/efl_integration/common/content_client_efl.h
@@ -16,8 +16,6 @@ namespace IPC {
 class ContentClientEfl : public content::ContentClient {
  public:
   // ContentClient implementation.
-  std::string GetProduct() const;
-  std::string GetUserAgent() const;
   virtual base::string16 GetLocalizedString(int message_id) const override;
   virtual base::StringPiece GetDataResource(
       int resource_id,

diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
index ac19277..e912fd5 100644 (file)
--- a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
@@ -26,6 +26,7 @@
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
+#include "common/version_info.h"
 #include "common/web_contents_utils.h"
 
 #if defined(OS_TIZEN)
@@ -352,4 +353,13 @@ scoped_refptr<QuotaPermissionContext>
 ContentBrowserClientEfl::CreateQuotaPermissionContext() {
   return new QuotaPermissionContextEfl();
 }
+
+std::string ContentBrowserClientEfl::GetProduct() const {
+  return EflWebView::VersionInfo::GetInstance()->ProductNameAndVersionForUserAgent();
+}
+
+std::string ContentBrowserClientEfl::GetUserAgent() const {
+  return EflWebView::VersionInfo::GetInstance()->DefaultUserAgent();
+}
+
 }

diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.h b/tizen_src/ewk/efl_integration/content_browser_client_efl.h
index 25a8059..1864567 100644 (file)
--- a/tizen_src/ewk/efl_integration/content_browser_client_efl.h
+++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.h
@@ -113,6 +113,9 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
     browser_context_efl_ = context;
   }
 
+  std::string GetProduct() const override;
+  std::string GetUserAgent() const override;
+
  private:
   static void SetCertificatePemOnUIThread(int render_process_id,
                                           int render_view_id,