diff options
Diffstat (limited to 'chrome/common/chrome_content_client.cc')
| -rw-r--r-- | chrome/common/chrome_content_client.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 369bc0a..040c8b0 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -9,9 +9,9 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_number_conversions.h" -#include "base/stringprintf.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/common/child_process_logging.h" #include "chrome/common/chrome_paths.h" @@ -25,6 +25,7 @@ #include "grit/common_resources.h" #include "remoting/client/plugin/pepper_entrypoints.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/glue/user_agent.h" #include "webkit/plugins/npapi/plugin_list.h" @@ -415,16 +416,11 @@ string16 ChromeContentClient::GetLocalizedString(int message_id) const { return l10n_util::GetStringUTF16(message_id); } -base::StringPiece ChromeContentClient::GetDataResource(int resource_id) const { - return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); -} - -base::StringPiece ChromeContentClient::GetImageResource( +base::StringPiece ChromeContentClient::GetDataResource( int resource_id, - float scale_factor) const { - // TODO(flackr): Pass scale_factor to ResourceBundle to get best matching - // image resource for the given scale factor. - return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); + ui::ScaleFactor scale_factor) const { + return ResourceBundle::GetSharedInstance().GetRawDataResource( + resource_id, scale_factor); } #if defined(OS_WIN) |