diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
| commit | c49201a506dba0e3a04aad623e4b259f948f3159 (patch) | |
| tree | 2a93fff52861f5c8dd87e23bc23d170b7cb1309e /content/test | |
| parent | 16bb3c2f909662329b117e063280f6cfc2cca3f9 (diff) | |
| download | chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.zip chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.gz chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.bz2 | |
Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."
Relanding original CL 137734, http://codereview.chromium.org/10387010/.
TBR=aa,abodenha,ben,sail,tony
BUG=123611
TEST=All try bots pass and aura runs without errors.
Review URL: https://chromiumcodereview.appspot.com/10412004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
| -rw-r--r-- | content/test/test_content_client.cc | 12 | ||||
| -rw-r--r-- | content/test/test_content_client.h | 6 |
2 files changed, 6 insertions, 12 deletions
diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc index 11d9bb6..0d2e3e0 100644 --- a/content/test/test_content_client.cc +++ b/content/test/test_content_client.cc @@ -11,7 +11,7 @@ #include "base/string_piece.h" TestContentClient::TestContentClient() - : data_pack_(ui::ResourceHandle::kScaleFactor100x) { + : data_pack_(ui::SCALE_FACTOR_100P) { FilePath content_resources_pack_path; PathService::Get(base::DIR_MODULE, &content_resources_pack_path); content_resources_pack_path = content_resources_pack_path.Append( @@ -58,15 +58,9 @@ string16 TestContentClient::GetLocalizedString(int message_id) const { return string16(); } -base::StringPiece TestContentClient::GetDataResource(int resource_id) const { - base::StringPiece resource; - data_pack_.GetStringPiece(resource_id, &resource); - return resource; -} - -base::StringPiece TestContentClient::GetImageResource( +base::StringPiece TestContentClient::GetDataResource( int resource_id, - float scale_factor) const { + ui::ScaleFactor scale_factor) const { base::StringPiece resource; data_pack_.GetStringPiece(resource_id, &resource); return resource; diff --git a/content/test/test_content_client.h b/content/test/test_content_client.h index 94fb820..ecf449b 100644 --- a/content/test/test_content_client.h +++ b/content/test/test_content_client.h @@ -32,9 +32,9 @@ class TestContentClient : 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, sandbox::TargetPolicy* policy) OVERRIDE; |