Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side 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: Fix presubmit. Created 7 years, 8 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/icon_loader_mac.mm ('k') | chrome/browser/icon_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/icon_loader.h" 5 #include "chrome/browser/icon_loader.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
13 #include "third_party/skia/include/core/SkBitmap.h" 13 #include "third_party/skia/include/core/SkBitmap.h"
14 #include "ui/gfx/icon_util.h" 14 #include "ui/gfx/icon_util.h"
15 #include "ui/gfx/image/image_skia.h" 15 #include "ui/gfx/image/image_skia.h"
16 #include "ui/gfx/size.h" 16 #include "ui/gfx/size.h"
17 17
18 // static
19 IconGroupID IconLoader::ReadGroupIDFromFilepath(
20 const base::FilePath& filepath) {
21 base::FilePath::StringType extension = filepath.Extension();
22 if (extension != L".exe" && extension != L".dll" && extension != L".ico")
23 return extension;
24 else
25 return filepath.value();
26 }
27
18 void IconLoader::ReadIcon() { 28 void IconLoader::ReadIcon() {
19 int size = 0; 29 int size = 0;
20 switch (icon_size_) { 30 switch (icon_size_) {
21 case IconLoader::SMALL: 31 case IconLoader::SMALL:
22 size = SHGFI_SMALLICON; 32 size = SHGFI_SMALLICON;
23 break; 33 break;
24 case IconLoader::NORMAL: 34 case IconLoader::NORMAL:
25 size = 0; 35 size = 0;
26 break; 36 break;
27 case IconLoader::LARGE: 37 case IconLoader::LARGE:
(...skipping 16 matching lines...) Expand all
44 image_skia.MakeThreadSafe(); 54 image_skia.MakeThreadSafe();
45 image_.reset(new gfx::Image(image_skia)); 55 image_.reset(new gfx::Image(image_skia));
46 DestroyIcon(file_info.hIcon); 56 DestroyIcon(file_info.hIcon);
47 } 57 }
48 } 58 }
49 59
50 // Always notify the delegate, regardless of success. 60 // Always notify the delegate, regardless of success.
51 target_message_loop_->PostTask(FROM_HERE, 61 target_message_loop_->PostTask(FROM_HERE,
52 base::Bind(&IconLoader::NotifyDelegate, this)); 62 base::Bind(&IconLoader::NotifyDelegate, this));
53 } 63 }
OLDNEW
« no previous file with comments | « chrome/browser/icon_loader_mac.mm ('k') | chrome/browser/icon_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698