| Index: athena/content/web_activity.cc
|
| diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc
|
| index 0385b47460f797f543e033690cf7167da9d038b9..70439c670475158dea8c4137eb8c6ebbe1b92a6a 100644
|
| --- a/athena/content/web_activity.cc
|
| +++ b/athena/content/web_activity.cc
|
| @@ -150,7 +150,9 @@ class AthenaWebView : public views::WebView {
|
|
|
| WebActivity::WebActivity(content::BrowserContext* browser_context,
|
| const GURL& url)
|
| - : browser_context_(browser_context), url_(url), web_view_(NULL) {
|
| + : browser_context_(browser_context),
|
| + url_(url),
|
| + web_view_(NULL) {
|
| }
|
|
|
| WebActivity::~WebActivity() {
|
| @@ -165,15 +167,19 @@ void WebActivity::Init() {
|
| static_cast<AthenaWebView*>(web_view_)->InstallAccelerators();
|
| }
|
|
|
| -SkColor WebActivity::GetRepresentativeColor() {
|
| +SkColor WebActivity::GetRepresentativeColor() const {
|
| // TODO(sad): Compute the color from the favicon.
|
| return SK_ColorGRAY;
|
| }
|
|
|
| -base::string16 WebActivity::GetTitle() {
|
| +base::string16 WebActivity::GetTitle() const {
|
| return web_view_->GetWebContents()->GetTitle();
|
| }
|
|
|
| +bool WebActivity::UsesFrame() const {
|
| + return true;
|
| +}
|
| +
|
| views::View* WebActivity::GetContentsView() {
|
| if (!web_view_) {
|
| web_view_ = new AthenaWebView(browser_context_);
|
|
|