Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e

1 files changed, 12 insertions, 6 deletions

diff --git a/athena/activity/public/activity_factory.h b/athena/activity/public/activity_factory.h
index cd79ca76b7..d38e31da56 100644
--- a/athena/activity/public/activity_factory.h
+++ b/athena/activity/public/activity_factory.h
@@ -13,7 +13,11 @@ class BrowserContext;
 }
 
 namespace extensions {
-class ShellAppWindow;
+class AppWindow;
+}
+
+namespace views {
+class WebView;
 }
 
 namespace athena {
@@ -32,14 +36,16 @@ class ATHENA_EXPORT ActivityFactory {
 
   virtual ~ActivityFactory() {}
 
-  // Create an activity of a web page.
+  // Create an activity of a web page. If |title| is empty, the title will be
+  // obtained from the web contents.
   virtual Activity* CreateWebActivity(content::BrowserContext* browser_context,
+                                      const base::string16& title,
                                       const GURL& url) = 0;
 
-  // Create an activity of an app with |app_window|. The returned activity
-  // should own |app_window|.
-  virtual Activity* CreateAppActivity(
-      extensions::ShellAppWindow* app_window) = 0;
+  // Create an activity of an app with |app_window| for chrome environment and
+  // |web_view| that will host the content.
+  virtual Activity* CreateAppActivity(extensions::AppWindow* app_window,
+                                      views::WebView* web_view) = 0;
 };
 
 }  // namespace athena