OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/scoped_ptr.h" | 7 #include "base/scoped_ptr.h" |
8 #include "gfx/gfx_paths.h" | 8 #include "gfx/gfx_paths.h" |
9 #include "gfx/icon_util.h" | 9 #include "gfx/icon_util.h" |
10 #include "gfx/size.h" | 10 #include "gfx/size.h" |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 // the .ico file we just created. We don't really check the additional icon | 247 // the .ico file we just created. We don't really check the additional icon |
248 // images created by IconUtil::CreateIconFileFromSkBitmap. | 248 // images created by IconUtil::CreateIconFileFromSkBitmap. |
249 HICON icon = LoadIconFromFile(icon_filename, | 249 HICON icon = LoadIconFromFile(icon_filename, |
250 kSmallIconWidth, | 250 kSmallIconWidth, |
251 kSmallIconHeight); | 251 kSmallIconHeight); |
252 EXPECT_NE(icon, static_cast<HICON>(NULL)); | 252 EXPECT_NE(icon, static_cast<HICON>(NULL)); |
253 if (icon != NULL) { | 253 if (icon != NULL) { |
254 ::DestroyIcon(icon); | 254 ::DestroyIcon(icon); |
255 } | 255 } |
256 } | 256 } |
OLD | NEW |