| Index: content/public/common/content_client.h
|
| diff --git a/content/public/common/content_client.h b/content/public/common/content_client.h
|
| index 61ad9b986969df96ae8fe1c8736fe78eda90b54a..1190328bba334cde4856f6c69b38b0ca01d4bca8 100644
|
| --- a/content/public/common/content_client.h
|
| +++ b/content/public/common/content_client.h
|
| @@ -14,6 +14,7 @@
|
| #include "base/string_piece.h"
|
| #include "build/build_config.h"
|
| #include "content/common/content_export.h"
|
| +#include "ui/base/layout.h"
|
|
|
| class CommandLine;
|
| class GURL;
|
| @@ -115,12 +116,9 @@ class CONTENT_EXPORT ContentClient {
|
| virtual string16 GetLocalizedString(int message_id) const = 0;
|
|
|
| // Return the contents of a resource in a StringPiece given the resource id.
|
| - virtual base::StringPiece GetDataResource(int resource_id) const = 0;
|
| -
|
| - // Return the contents of an image resource in a StringPiece given the
|
| - // resource id.
|
| - virtual base::StringPiece GetImageResource(int resource_id,
|
| - float scale_factor) const = 0;
|
| + virtual base::StringPiece GetDataResource(
|
| + int resource_id,
|
| + ui::ScaleFactor scale_factor) const = 0;
|
|
|
| #if defined(OS_WIN)
|
| // Allows the embedder to sandbox a plugin, and apply a custom policy.
|
|
|