| Index: chrome/common/chrome_content_client.h
|
| diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h
|
| index 40f6f9bc8c662fede45def232ee55f065c5ed2d1..804f6663ea0c0da38a44c1d89d345ede9c0cbc4f 100644
|
| --- a/chrome/common/chrome_content_client.h
|
| +++ b/chrome/common/chrome_content_client.h
|
| @@ -29,7 +29,7 @@ class ChromeContentClient : public content::ContentClient {
|
| virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE;
|
| virtual std::string GetProduct() const OVERRIDE;
|
| virtual std::string GetUserAgent() const OVERRIDE;
|
| - virtual string16 GetLocalizedString(int message_id) const OVERRIDE;
|
| + virtual base::string16 GetLocalizedString(int message_id) const OVERRIDE;
|
| virtual base::StringPiece GetDataResource(
|
| int resource_id,
|
| ui::ScaleFactor scale_factor) const OVERRIDE;
|
|
|