diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/ui/base/webui/web_ui_util.cc | |
parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
download | qtwebengine-chromium-3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859.tar.gz |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/ui/base/webui/web_ui_util.cc')
-rw-r--r-- | chromium/ui/base/webui/web_ui_util.cc | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/chromium/ui/base/webui/web_ui_util.cc b/chromium/ui/base/webui/web_ui_util.cc index 359c6e4fcee..160f4dac012 100644 --- a/chromium/ui/base/webui/web_ui_util.cc +++ b/chromium/ui/base/webui/web_ui_util.cc @@ -43,23 +43,6 @@ std::string GetBitmapDataUrl(const SkBitmap& bitmap) { return str_url; } -std::string GetBitmapDataUrlFromResource(int res) { - // Load resource icon and covert to base64 encoded data url - base::RefCountedStaticMemory* icon_data = - ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( - res, ui::SCALE_FACTOR_100P); - if (!icon_data) - return std::string(); - scoped_refptr<base::RefCountedMemory> raw_icon(icon_data); - std::string str_url; - str_url.insert(str_url.end(), - raw_icon->front(), - raw_icon->front() + raw_icon->size()); - base::Base64Encode(str_url, &str_url); - str_url.insert(0, "data:image/png;base64,"); - return str_url; -} - WindowOpenDisposition GetDispositionFromClick(const base::ListValue* args, int start_index) { double button = 0.0; |