| Index: chrome/browser/shell_integration_linux.cc
|
| diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
|
| index 574bd09382209dcb6ab52d143c6702f6da0f28e6..d351c35caf4440b144a5736cedbbc8a022e6b105 100644
|
| --- a/chrome/browser/shell_integration_linux.cc
|
| +++ b/chrome/browser/shell_integration_linux.cc
|
| @@ -73,7 +73,7 @@ bool LaunchXdgUtility(const std::vector<std::string>& argv, int* exit_code) {
|
| std::string CreateShortcutIcon(
|
| const ShellIntegration::ShortcutInfo& shortcut_info,
|
| const FilePath& shortcut_filename) {
|
| - if (shortcut_info.favicon.isNull())
|
| + if (shortcut_info.favicon.IsEmpty())
|
| return std::string();
|
|
|
| // TODO(phajdan.jr): Report errors from this function, possibly as infobars.
|
| @@ -85,7 +85,8 @@ std::string CreateShortcutIcon(
|
| shortcut_filename.ReplaceExtension("png"));
|
|
|
| std::vector<unsigned char> png_data;
|
| - gfx::PNGCodec::EncodeBGRASkBitmap(shortcut_info.favicon, false, &png_data);
|
| + const SkBitmap* bitmap = shortcut_info.favicon.ToSkBitmap();
|
| + gfx::PNGCodec::EncodeBGRASkBitmap(*bitmap, false, &png_data);
|
| int bytes_written = file_util::WriteFile(temp_file_path,
|
| reinterpret_cast<char*>(png_data.data()), png_data.size());
|
|
|
| @@ -102,7 +103,7 @@ std::string CreateShortcutIcon(
|
| argv.push_back("user");
|
|
|
| argv.push_back("--size");
|
| - argv.push_back(base::IntToString(shortcut_info.favicon.width()));
|
| + argv.push_back(base::IntToString(bitmap->width()));
|
|
|
| argv.push_back(temp_file_path.value());
|
| std::string icon_name = temp_file_path.BaseName().RemoveExtension().value();
|
|
|