Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / renderer / tizen / xwalk_content_renderer_client_tizen.h

diff --git a/src/xwalk/runtime/renderer/tizen/xwalk_content_renderer_client_tizen.h b/src/xwalk/runtime/renderer/tizen/xwalk_content_renderer_client_tizen.h
index 22cf7d5..9abc8e3 100644 (file)
--- a/src/xwalk/runtime/renderer/tizen/xwalk_content_renderer_client_tizen.h
+++ b/src/xwalk/runtime/renderer/tizen/xwalk_content_renderer_client_tizen.h
@@ -1,4 +1,5 @@
 // Copyright (c) 2013 Intel Corporation. All rights reserved.
+// Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -15,22 +16,23 @@ class XWalkContentRendererClientTizen : public XWalkContentRendererClient {
  public:
   XWalkContentRendererClientTizen() : XWalkContentRendererClient() {}
 
-  virtual bool WillSendRequest(blink::WebFrame* frame,
-                               content::PageTransition transition_type,
-                               const GURL& url,
-                               const GURL& first_party_for_cookies,
-                               GURL* new_url) OVERRIDE;
+  bool WillSendRequest(blink::WebFrame* frame,
+                       ui::PageTransition transition_type,
+                       const GURL& url,
+                       const GURL& first_party_for_cookies,
+                       GURL* new_url) override;
 
-  virtual bool HasErrorPage(int http_status_code,
-                            std::string* error_domain) OVERRIDE;
+  bool HasErrorPage(int http_status_code,
+                    std::string* error_domain) override;
 
-  virtual void GetNavigationErrorStrings(
+  void GetNavigationErrorStrings(
       content::RenderView* render_view,
       blink::WebFrame* frame,
       const blink::WebURLRequest& failed_request,
       const blink::WebURLError& error,
       std::string* error_html,
-      base::string16* error_description) OVERRIDE;
+      base::string16* error_description) override;
+  std::string GetOverridenUserAgent() const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(XWalkContentRendererClientTizen);