Update To 11.40.268.0

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

diff --git a/src/athena/content/content_activity_factory.h b/src/athena/content/content_activity_factory.h
index 25c6d38..17f7070 100644 (file)
--- a/src/athena/content/content_activity_factory.h
+++ b/src/athena/content/content_activity_factory.h
@@ -13,14 +13,15 @@ namespace athena {
 class ContentActivityFactory : public ActivityFactory {
  public:
   ContentActivityFactory();
-  virtual ~ContentActivityFactory();
+  ~ContentActivityFactory() override;
 
   // Overridden from ActivityFactory:
-  virtual Activity* CreateWebActivity(content::BrowserContext* browser_context,
-                                      const base::string16& title,
-                                      const GURL& url) OVERRIDE;
-  virtual Activity* CreateAppActivity(extensions::AppWindow* app_window,
-                                      views::WebView* web_view) OVERRIDE;
+  Activity* CreateWebActivity(content::BrowserContext* browser_context,
+                              const base::string16& title,
+                              const GURL& url) override;
+  Activity* CreateWebActivity(content::WebContents* contents) override;
+  Activity* CreateAppActivity(const std::string& app_id,
+                              views::WebView* web_view) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory);