| Index: athena/content/shell/shell_app_activity.h
|
| diff --git a/athena/content/shell/shell_app_activity.h b/athena/content/shell/shell_app_activity.h
|
| index f91c555df2a6bfa224400677f37d7d1825afa032..042ccb32594a2555707de907c2c56d5e86dc358c 100644
|
| --- a/athena/content/shell/shell_app_activity.h
|
| +++ b/athena/content/shell/shell_app_activity.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
|
|
| namespace extensions {
|
| +class AppWindow;
|
| class ShellAppWindow;
|
| }
|
|
|
| @@ -17,6 +18,8 @@ namespace athena {
|
|
|
| class ShellAppActivity : public AppActivity {
|
| public:
|
| + explicit ShellAppActivity(extensions::AppWindow* app_window);
|
| + // TODO(hashimoto) Remove this.
|
| ShellAppActivity(extensions::ShellAppWindow* app_window,
|
| const std::string& app_id);
|
| virtual ~ShellAppActivity();
|
| @@ -25,6 +28,7 @@ class ShellAppActivity : public AppActivity {
|
| // AppActivity:
|
| virtual content::WebContents* GetWebContents() OVERRIDE;
|
|
|
| + extensions::AppWindow* app_window_;
|
| scoped_ptr<extensions::ShellAppWindow> shell_app_window_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellAppActivity);
|
|
|