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

Side by Side Diff: chrome/browser/icon_loader_win.cc

Issue 832953002: Cleanup: Update the path to gfx size headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years, 11 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
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/message_loop.h" 11 #include "base/message_loop/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/geometry/size.h"
14 #include "ui/gfx/icon_util.h" 15 #include "ui/gfx/icon_util.h"
15 #include "ui/gfx/image/image_skia.h" 16 #include "ui/gfx/image/image_skia.h"
16 #include "ui/gfx/size.h"
17 #include "ui/gfx/win/dpi.h" 17 #include "ui/gfx/win/dpi.h"
18 18
19 // static 19 // static
20 IconGroupID IconLoader::ReadGroupIDFromFilepath( 20 IconGroupID IconLoader::ReadGroupIDFromFilepath(
21 const base::FilePath& filepath) { 21 const base::FilePath& filepath) {
22 if (!IsIconMutableFromFilepath(filepath)) 22 if (!IsIconMutableFromFilepath(filepath))
23 return filepath.Extension(); 23 return filepath.Extension();
24 return filepath.value(); 24 return filepath.value();
25 } 25 }
26 26
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 image_skia.MakeThreadSafe(); 65 image_skia.MakeThreadSafe();
66 image_.reset(new gfx::Image(image_skia)); 66 image_.reset(new gfx::Image(image_skia));
67 DestroyIcon(file_info.hIcon); 67 DestroyIcon(file_info.hIcon);
68 } 68 }
69 } 69 }
70 70
71 // Always notify the delegate, regardless of success. 71 // Always notify the delegate, regardless of success.
72 target_message_loop_->PostTask(FROM_HERE, 72 target_message_loop_->PostTask(FROM_HERE,
73 base::Bind(&IconLoader::NotifyDelegate, this)); 73 base::Bind(&IconLoader::NotifyDelegate, this));
74 } 74 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/favicon_downloader.cc ('k') | chrome/browser/prerender/prerender_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698