summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 18:32:54 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 18:32:54 +0000
commit89a6d31c96f2d54a6b985e9aa9913e20836d1e4d (patch)
tree6fe013975a64dc1570d455e94d9ffc8153c9dda5 /android_webview
parentc10baf7109f37d519f2500d4c4ba8206b7deee07 (diff)
downloadchromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.zip
chromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.tar.gz
chromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.tar.bz2
Add method to load resources without scale
This removes a lot of necessary reference to SCALE_FACTOR_NONE, and eliminate layout.h I'll cleanup ContentClient in separate CL. BUG=156569 TEST=none. no functional change. Review URL: https://chromiumcodereview.appspot.com/11341003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/common/aw_content_client.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc
index c8823e6..a7b467d 100644
--- a/android_webview/common/aw_content_client.cc
+++ b/android_webview/common/aw_content_client.cc
@@ -31,9 +31,8 @@ base::StringPiece AwContentClient::GetDataResource(
ui::ScaleFactor scale_factor) const {
// TODO(boliu): Used only by WebKit, so only bundle those resources for
// Android WebView.
- return ResourceBundle::GetSharedInstance().GetRawDataResource(
+ return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
resource_id, scale_factor);
}
} // namespace android_webview
-