| Index: ash/shell/content_client/shell_content_browser_client.h
|
| diff --git a/ash/shell/content_client/shell_content_browser_client.h b/ash/shell/content_client/shell_content_browser_client.h
|
| index 950673877d8389ec19d8b8e134eec2f932f9edb7..96b7301fb4ffcd71c3d8b9f97febb09989b78569 100644
|
| --- a/ash/shell/content_client/shell_content_browser_client.h
|
| +++ b/ash/shell/content_client/shell_content_browser_client.h
|
| @@ -68,7 +68,7 @@ class ShellContentBrowserClient : public content::ContentBrowserClient {
|
| virtual std::string GetApplicationLocale() OVERRIDE;
|
| virtual std::string GetAcceptLangs(
|
| content::BrowserContext* context) OVERRIDE;
|
| - virtual SkBitmap* GetDefaultFavicon() OVERRIDE;
|
| + virtual gfx::ImageSkia* GetDefaultFavicon() OVERRIDE;
|
| virtual bool AllowAppCache(const GURL& manifest_url,
|
| const GURL& first_party,
|
| content::ResourceContext* context) OVERRIDE;
|
|
|