Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2275)

Unified Diff: athena/content/shell/shell_app_activity.h

Issue 552133003: Support app.window.create on athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apifeatures
Patch Set: Address comments Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/content/shell/content_activity_factory.cc ('k') | athena/content/shell/shell_app_activity.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 336293e0bd66e3c0e6cdf377cf9eb222f669e931..ad3467bf602a972f8af828f0c28a4c59466032fa 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();
@@ -28,6 +31,7 @@ class ShellAppActivity : public AppActivity {
// AppActivity:
virtual views::WebView* GetWebView() OVERRIDE;
+ extensions::AppWindow* app_window_;
scoped_ptr<extensions::ShellAppWindow> shell_app_window_;
DISALLOW_COPY_AND_ASSIGN(ShellAppActivity);
« no previous file with comments | « athena/content/shell/content_activity_factory.cc ('k') | athena/content/shell/shell_app_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698