Commit 93fc0b7f authored by erikchen's avatar erikchen Committed by Commit Bot

Fix memory leak in GetBookmarkFolderIcon.

Change-Id: Ia38e827130b7cbb553a3954c5b5df58f506a7e70
Reviewed-on: https://chromium-review.googlesource.com/1136515Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574967}
parent ac22e11d
...@@ -301,9 +301,10 @@ gfx::ImageSkia GetBookmarkFolderIcon(SkColor text_color) { ...@@ -301,9 +301,10 @@ gfx::ImageSkia GetBookmarkFolderIcon(SkColor text_color) {
int resource_id = color_utils::IsDark(text_color) int resource_id = color_utils::IsDark(text_color)
? IDR_BOOKMARK_BAR_FOLDER ? IDR_BOOKMARK_BAR_FOLDER
: IDR_BOOKMARK_BAR_FOLDER_WHITE; : IDR_BOOKMARK_BAR_FOLDER_WHITE;
return *ui::ResourceBundle::GetSharedInstance() std::unique_ptr<gfx::ImageSkia> image(ui::ResourceBundle::GetSharedInstance()
.GetNativeImageNamed(resource_id) .GetNativeImageNamed(resource_id)
.CopyImageSkia(); .CopyImageSkia());
return *image.get();
#else #else
return GetFolderIcon(ui::MaterialDesignController::IsTouchOptimizedUiEnabled() return GetFolderIcon(ui::MaterialDesignController::IsTouchOptimizedUiEnabled()
? vector_icons::kFolderTouchIcon ? vector_icons::kFolderTouchIcon
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment