chrome/browser/icon_loader_win.cc - Issue 12211049: Removing base::ThreadRestrictions::ScopedAllowIO from icon_manager_linux.cc

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/icon_loader_win.cc

Issue 12211049: Removing base::ThreadRestrictions::ScopedAllowIO from icon_manager_linux.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/icon_loader_win.cc

diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc

index 7aa1455f8539ad7e654e07399ac4ca072757292d..c957374e9d3f8e6222987a0e8c9a8ff20727d79d 100644

--- a/chrome/browser/icon_loader_win.cc

+++ b/chrome/browser/icon_loader_win.cc

@@ -15,7 +15,7 @@

#include "ui/gfx/image/image_skia.h"

#include "ui/gfx/size.h"

-void IconLoader::ReadIcon() {

+void IconLoader::ReadIcon(const IconGroupID& group) {

int size = 0;

switch (icon_size_) {

case IconLoader::SMALL:

@@ -34,7 +34,7 @@ void IconLoader::ReadIcon() {

image_.reset();

SHFILEINFO file_info = { 0 };

- if (SHGetFileInfo(group_.c_str(), FILE_ATTRIBUTE_NORMAL, &file_info,

+ if (SHGetFileInfo(group.c_str(), FILE_ATTRIBUTE_NORMAL, &file_info,

sizeof(SHFILEINFO),

SHGFI_ICON | size | SHGFI_USEFILEATTRIBUTES)) {

scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(

« no previous file with comments | « chrome/browser/icon_loader_mac.mm ('k') | chrome/browser/icon_manager.h » ('j') | chrome/browser/icon_manager.h » ('J')