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

Side by Side Diff: app/gfx/icon_util_unittest.cc

Issue 113108: Remove unneeded ATL header includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 <atlbase.h>
6 #include <atlapp.h>
7 #include <atlmisc.h>
8
9 #include "app/gfx/icon_util.h" 5 #include "app/gfx/icon_util.h"
10 #include "base/gfx/size.h" 6 #include "base/gfx/size.h"
11 #include "base/scoped_ptr.h" 7 #include "base/scoped_ptr.h"
12 #include "base/file_util.h" 8 #include "base/file_util.h"
13 #include "base/path_service.h" 9 #include "base/path_service.h"
14 #include "chrome/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
15 #include "skia/include/SkBitmap.h" 11 #include "skia/include/SkBitmap.h"
16 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
17 13
18 namespace { 14 namespace {
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 // the .ico file we just created. We don't really check the additional icon 251 // the .ico file we just created. We don't really check the additional icon
256 // images created by IconUtil::CreateIconFileFromSkBitmap. 252 // images created by IconUtil::CreateIconFileFromSkBitmap.
257 HICON icon = LoadIconFromFile(icon_filename, 253 HICON icon = LoadIconFromFile(icon_filename,
258 kSmallIconWidth, 254 kSmallIconWidth,
259 kSmallIconHeight); 255 kSmallIconHeight);
260 EXPECT_NE(icon, static_cast<HICON>(NULL)); 256 EXPECT_NE(icon, static_cast<HICON>(NULL));
261 if (icon != NULL) { 257 if (icon != NULL) {
262 ::DestroyIcon(icon); 258 ::DestroyIcon(icon);
263 } 259 }
264 } 260 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698