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

Unified Diff: athena/content/app_activity.h

Issue 335003003: Introduces AppActivity and handler of chrome.shell API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: AppWindow ownership Created 6 years, 6 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
Index: athena/content/app_activity.h
diff --git a/athena/content/web_activity.h b/athena/content/app_activity.h
similarity index 73%
copy from athena/content/web_activity.h
copy to athena/content/app_activity.h
index af012d9f54f307e0ee4d6a5158beb8ac33dc02e1..6c5a7422e7af3bea50a3534ea10d723f138dcbb0 100644
--- a/athena/content/web_activity.h
+++ b/athena/content/app_activity.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ATHENA_CONTENT_PUBLIC_WEB_ACTIVITY_H_
-#define ATHENA_CONTENT_PUBLIC_WEB_ACTIVITY_H_
+#ifndef ATHENA_CONTENT_PUBLIC_APP_ACTIVITY_H_
+#define ATHENA_CONTENT_PUBLIC_APP_ACTIVITY_H_
#include "athena/activity/public/activity.h"
#include "athena/activity/public/activity_view_model.h"
#include "content/public/browser/web_contents_observer.h"
-namespace content {
-class BrowserContext;
+namespace apps {
+class ShellAppWindow;
}
namespace views {
@@ -19,12 +19,12 @@ class WebView;
namespace athena {
-class WebActivity : public Activity,
+class AppActivity : public Activity,
public ActivityViewModel,
public content::WebContentsObserver {
public:
- WebActivity(content::BrowserContext* context, const GURL& gurl);
- virtual ~WebActivity();
+ explicit AppActivity(apps::ShellAppWindow* app_window);
+ virtual ~AppActivity();
protected:
// Activity:
@@ -43,13 +43,12 @@ class WebActivity : public Activity,
const std::vector<content::FaviconURL>& candidates) OVERRIDE;
private:
- content::BrowserContext* browser_context_;
- const GURL url_;
+ scoped_ptr<apps::ShellAppWindow> app_window_;
views::WebView* web_view_;
- DISALLOW_COPY_AND_ASSIGN(WebActivity);
+ DISALLOW_COPY_AND_ASSIGN(AppActivity);
};
} // namespace athena
-#endif // ATHENA_CONTENT_WEB_ACTIVITY_H_
+#endif // ATHENA_CONTENT_APP_ACTIVITY_H_

Powered by Google App Engine
This is Rietveld 408576698