| Index: chrome/common/chrome_content_client.h
|
| diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h
|
| index a69cd8725c7a82864e377cadd036e2da5f666362..e6074d5d40f6f2bf21812303a7a05e7229c4b674 100644
|
| --- a/chrome/common/chrome_content_client.h
|
| +++ b/chrome/common/chrome_content_client.h
|
| @@ -33,9 +33,9 @@ class ChromeContentClient : public content::ContentClient {
|
| virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE;
|
| virtual std::string GetUserAgent() const OVERRIDE;
|
| virtual string16 GetLocalizedString(int message_id) const OVERRIDE;
|
| - virtual base::StringPiece GetDataResource(int resource_id) const OVERRIDE;
|
| - virtual base::StringPiece GetImageResource(int resource_id,
|
| - float scale_factor) const OVERRIDE;
|
| + virtual base::StringPiece GetDataResource(
|
| + int resource_id,
|
| + ui::ScaleFactor scale_factor) const OVERRIDE;
|
|
|
| #if defined(OS_WIN)
|
| virtual bool SandboxPlugin(CommandLine* command_line,
|
|
|