Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / browser / runtime.h

diff --git a/src/xwalk/runtime/browser/runtime.h b/src/xwalk/runtime/browser/runtime.h
index f0d8d18..23fb581 100644 (file)
--- a/src/xwalk/runtime/browser/runtime.h
+++ b/src/xwalk/runtime/browser/runtime.h
@@ -22,8 +22,9 @@
 namespace content {
 class ColorChooser;
 struct FileChooserParams;
-class WebContents;
 class RenderProcessHost;
+class SiteInstance;
+class WebContents;
 }
 
 namespace xwalk {
@@ -43,14 +44,14 @@ class Runtime : public content::WebContentsDelegate,
   // is overridden WebContentsDelegate method. The "observer" is needed to
   // observe appearance and removal of such Runtime instances.
   class Observer {
-    public:
+   public:
       // Called when a new Runtime instance is added.
       virtual void OnRuntimeAdded(Runtime* runtime) = 0;
 
       // Called when a Runtime instance is removed.
       virtual void OnRuntimeRemoved(Runtime* runtime) = 0;
 
-    protected:
+   protected:
       virtual ~Observer() {}
   };
 
@@ -60,7 +61,8 @@ class Runtime : public content::WebContentsDelegate,
   static Runtime* CreateWithDefaultWindow(RuntimeContext*,
                                           const GURL&, Observer* = NULL);
   // Create a new Runtime instance with the given browsing context.
-  static Runtime* Create(RuntimeContext*, Observer* = NULL);
+  static Runtime* Create(RuntimeContext*,
+                         Observer* = NULL, content::SiteInstance* = NULL);
 
   // Attach to a default app window.
   void AttachDefaultWindow();
@@ -134,7 +136,7 @@ class Runtime : public content::WebContentsDelegate,
       const content::MediaResponseCallback& callback) OVERRIDE;
 
   // Overridden from content::WebContentsObserver.
-  virtual void DidUpdateFaviconURL(int32 page_id,
+  virtual void DidUpdateFaviconURL(
       const std::vector<content::FaviconURL>& candidates) OVERRIDE;
 
   // Callback method for WebContents::DownloadImage.