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

Unified Diff: athena/content/web_activity.h

Issue 375143002: Use Widget frame and WidgetDelegate in ActvityWidget (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/web_activity.h
diff --git a/athena/content/web_activity.h b/athena/content/web_activity.h
index 840cceefb3862f4e5f23f6d8780aada9c2c8309e..ba44372d87df8e5dd4127b0be3108cb4df9535e2 100644
--- a/athena/content/web_activity.h
+++ b/athena/content/web_activity.h
@@ -16,6 +16,7 @@ class WebContents;
namespace views {
class WebView;
+class WidgetDelegate;
}
namespace athena {
@@ -33,8 +34,9 @@ class WebActivity : public Activity,
// ActivityViewModel:
virtual void Init() OVERRIDE;
- virtual SkColor GetRepresentativeColor() OVERRIDE;
- virtual base::string16 GetTitle() OVERRIDE;
+ virtual SkColor GetRepresentativeColor() const OVERRIDE;
+ virtual base::string16 GetTitle() const OVERRIDE;
+ virtual bool UsesFrame() const OVERRIDE;
virtual views::View* GetContentsView() OVERRIDE;
// content::WebContentsObserver:
@@ -45,7 +47,6 @@ class WebActivity : public Activity,
private:
content::BrowserContext* browser_context_;
- content::WebContents* web_contents_;
const GURL url_;
views::WebView* web_view_;

Powered by Google App Engine
This is Rietveld 408576698