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

Unified Diff: athena/content/web_activity.h

Issue 314303004: Use webview in web activity (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « athena/content/content_activity_factory.cc ('k') | athena/content/web_activity.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/web_activity.h
diff --git a/athena/content/web_activity.h b/athena/content/web_activity.h
index 5b400192e9eb8228e5fbd95e55fdfd1352cff801..32a8425c8aec0d2993886093190374bb909b9a78 100644
--- a/athena/content/web_activity.h
+++ b/athena/content/web_activity.h
@@ -10,7 +10,11 @@
#include "content/public/browser/web_contents_observer.h"
namespace content {
-class WebContents;
+class BrowserContext;
+}
+
+namespace views {
+class WebView;
}
namespace athena {
@@ -19,7 +23,7 @@ class WebActivity : public Activity,
public ActivityViewModel,
public content::WebContentsObserver {
public:
- explicit WebActivity(content::WebContents* contents);
+ WebActivity(content::BrowserContext* context, const GURL& gurl);
virtual ~WebActivity();
protected:
@@ -29,7 +33,7 @@ class WebActivity : public Activity,
// ActivityViewModel:
virtual SkColor GetRepresentativeColor() OVERRIDE;
virtual std::string GetTitle() OVERRIDE;
- virtual aura::Window* GetNativeWindow() OVERRIDE;
+ virtual views::View* GetContentsView() OVERRIDE;
// content::WebContentsObserver:
virtual void TitleWasSet(content::NavigationEntry* entry,
@@ -38,6 +42,10 @@ class WebActivity : public Activity,
const std::vector<content::FaviconURL>& candidates) OVERRIDE;
private:
+ content::BrowserContext* browser_context_;
+ const GURL url_;
+ views::WebView* web_view_;
+
DISALLOW_COPY_AND_ASSIGN(WebActivity);
};
« no previous file with comments | « athena/content/content_activity_factory.cc ('k') | athena/content/web_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698