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

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

Issue 115012: Move: drag_drop_types, favicon_size, icon_util, insets, path, message_box_fla... (Closed) Base URL: svn://chrome-svn/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 | « app/gfx/icon_util.cc ('k') | app/gfx/path_gtk.cc » ('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) 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> 5 #include <atlbase.h>
6 #include <atlapp.h> 6 #include <atlapp.h>
7 #include <atlmisc.h> 7 #include <atlmisc.h>
8 8
9 #include "chrome/common/gfx/icon_util.h" 9 #include "app/gfx/icon_util.h"
10 #include "base/gfx/size.h" 10 #include "base/gfx/size.h"
11 #include "base/scoped_ptr.h" 11 #include "base/scoped_ptr.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "chrome/common/chrome_paths.h" 14 #include "chrome/common/chrome_paths.h"
15 #include "skia/include/SkBitmap.h" 15 #include "skia/include/SkBitmap.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 namespace { 18 namespace {
19 19
(...skipping 235 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 255 // the .ico file we just created. We don't really check the additional icon
256 // images created by IconUtil::CreateIconFileFromSkBitmap. 256 // images created by IconUtil::CreateIconFileFromSkBitmap.
257 HICON icon = LoadIconFromFile(icon_filename, 257 HICON icon = LoadIconFromFile(icon_filename,
258 kSmallIconWidth, 258 kSmallIconWidth,
259 kSmallIconHeight); 259 kSmallIconHeight);
260 EXPECT_NE(icon, static_cast<HICON>(NULL)); 260 EXPECT_NE(icon, static_cast<HICON>(NULL));
261 if (icon != NULL) { 261 if (icon != NULL) {
262 ::DestroyIcon(icon); 262 ::DestroyIcon(icon);
263 } 263 }
264 } 264 }
OLDNEW
« no previous file with comments | « app/gfx/icon_util.cc ('k') | app/gfx/path_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698