Index: athena/content/app_activity.cc |
diff --git a/athena/content/app_activity.cc b/athena/content/app_activity.cc |
index e25d9f32150ee89bbdd5fc35b51fe32404376099..5a214302db2ba334dc3d594f3d5f4426bd599fd9 100644 |
--- a/athena/content/app_activity.cc |
+++ b/athena/content/app_activity.cc |
@@ -27,17 +27,22 @@ ActivityViewModel* AppActivity::GetActivityViewModel() { |
void AppActivity::Init() { |
} |
-SkColor AppActivity::GetRepresentativeColor() { |
+SkColor AppActivity::GetRepresentativeColor() const { |
// TODO(sad): Compute the color from the favicon. |
return SK_ColorGRAY; |
} |
-base::string16 AppActivity::GetTitle() { |
+base::string16 AppActivity::GetTitle() const { |
return web_view_->GetWebContents()->GetTitle(); |
} |
+bool AppActivity::UsesFrame() const { |
+ return false; |
+} |
+ |
views::View* AppActivity::GetContentsView() { |
if (!web_view_) { |
+ // TODO(oshimaa): use apps::NativeAppWindowViews |
Jun Mukai
2014/07/11 01:28:14
nit: typo on your name :)
oshima
2014/07/11 06:51:35
Done.
|
content::WebContents* web_contents = |
app_window_->GetAssociatedWebContents(); |
web_view_ = new views::WebView(web_contents->GetBrowserContext()); |