Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / athena / content / content_proxy.h

diff --git a/src/athena/content/content_proxy.h b/src/athena/content/content_proxy.h
index e460338..e39d1bb 100644 (file)
--- a/src/athena/content/content_proxy.h
+++ b/src/athena/content/content_proxy.h
@@ -17,7 +17,6 @@ class WebView;
 
 namespace athena {
 
-class Activity;
 class ProxyImageData;
 
 // This object creates and holds proxy content which gets shown instead of the
@@ -29,9 +28,8 @@ class ProxyImageData;
 // and then the link to the |web_view_| will get severed.
 class ContentProxy {
  public:
-  // Creates the object by creating a sized down |web_view| layer and making it
-  // visible inside |activity|'s window.
-  ContentProxy(views::WebView* web_view, Activity* activity);
+  // Creates the object by creating a sized down |web_view| layer.
+  explicit ContentProxy(views::WebView* web_view);
   // TODO(skuhne): Add a function to create this object from a passed PNG, so
   // that we can create it from a session restore.
 
@@ -79,7 +77,7 @@ class ContentProxy {
 
   // The web view which was passed on creation and is associated with this
   // object. It will be shown when OnPreContentDestroyed() gets called and then
-  // set to NULL. The ownership remains with the creator.
+  // set to nullptr. The ownership remains with the creator.
   views::WebView* web_view_;
 
   // While we are doing our PNG encode, we keep the read back image to have