OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_ | 5 #ifndef ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_ |
6 #define ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_ | 6 #define ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_ |
7 | 7 |
8 #include "athena/content/app_activity.h" | 8 #include "athena/content/app_activity.h" |
9 | 9 |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 | 11 |
12 namespace extensions { | 12 namespace extensions { |
| 13 class AppWindow; |
13 class ShellAppWindow; | 14 class ShellAppWindow; |
14 } | 15 } |
15 | 16 |
16 namespace athena { | 17 namespace athena { |
17 | 18 |
18 class ShellAppActivity : public AppActivity { | 19 class ShellAppActivity : public AppActivity { |
19 public: | 20 public: |
| 21 explicit ShellAppActivity(extensions::AppWindow* app_window); |
| 22 // TODO(hashimoto) Remove this. |
20 ShellAppActivity(extensions::ShellAppWindow* app_window, | 23 ShellAppActivity(extensions::ShellAppWindow* app_window, |
21 const std::string& app_id); | 24 const std::string& app_id); |
22 virtual ~ShellAppActivity(); | 25 virtual ~ShellAppActivity(); |
23 | 26 |
24 private: | 27 private: |
25 // ActivityViewModel: | 28 // ActivityViewModel: |
26 virtual views::Widget* CreateWidget() OVERRIDE; | 29 virtual views::Widget* CreateWidget() OVERRIDE; |
27 | 30 |
28 // AppActivity: | 31 // AppActivity: |
29 virtual views::WebView* GetWebView() OVERRIDE; | 32 virtual views::WebView* GetWebView() OVERRIDE; |
30 | 33 |
| 34 extensions::AppWindow* app_window_; |
31 scoped_ptr<extensions::ShellAppWindow> shell_app_window_; | 35 scoped_ptr<extensions::ShellAppWindow> shell_app_window_; |
32 | 36 |
33 DISALLOW_COPY_AND_ASSIGN(ShellAppActivity); | 37 DISALLOW_COPY_AND_ASSIGN(ShellAppActivity); |
34 }; | 38 }; |
35 | 39 |
36 } // namespace athena | 40 } // namespace athena |
37 | 41 |
38 #endif // ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_ | 42 #endif // ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_ |
OLD | NEW |