| Index: athena/content/app_activity.cc
|
| diff --git a/athena/content/app_activity.cc b/athena/content/app_activity.cc
|
| index e25d9f32150ee89bbdd5fc35b51fe32404376099..cd32be889deb4e4ed1f89eb2adb1d5685f94b6ec 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(oshima): use apps::NativeAppWindowViews
|
| content::WebContents* web_contents =
|
| app_window_->GetAssociatedWebContents();
|
| web_view_ = new views::WebView(web_contents->GetBrowserContext());
|
|
|