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

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

Issue 6246027: Move src/gfx/ to src/ui/gfx... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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 | « ui/gfx/icon_util.cc ('k') | ui/gfx/insets.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) 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
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 }
OLDNEW
« no previous file with comments | « ui/gfx/icon_util.cc ('k') | ui/gfx/insets.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698