| Index: athena/content/web_activity.h
|
| diff --git a/athena/content/web_activity.h b/athena/content/web_activity.h
|
| index 32a8425c8aec0d2993886093190374bb909b9a78..8fb5c65587d8e1b9bf6625e9c4fe6002f1a1914f 100644
|
| --- a/athena/content/web_activity.h
|
| +++ b/athena/content/web_activity.h
|
| @@ -32,7 +32,7 @@ class WebActivity : public Activity,
|
|
|
| // ActivityViewModel:
|
| virtual SkColor GetRepresentativeColor() OVERRIDE;
|
| - virtual std::string GetTitle() OVERRIDE;
|
| + virtual base::string16 GetTitle() OVERRIDE;
|
| virtual views::View* GetContentsView() OVERRIDE;
|
|
|
| // content::WebContentsObserver:
|
|
|