summaryrefslogtreecommitdiffstats
path: root/ui/ui_unittests.gypi
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-14 19:45:34 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-14 19:45:34 +0000
commitbe74fb58a37659c21a7e785589c383b688595be6 (patch)
tree5a9f41de2b3ed29c7ead47669de695e36011cab2 /ui/ui_unittests.gypi
parent6c70eeb6d75752cf322548f8b4b82324ab9456ba (diff)
downloadchromium_src-be74fb58a37659c21a7e785589c383b688595be6.zip
chromium_src-be74fb58a37659c21a7e785589c383b688595be6.tar.gz
chromium_src-be74fb58a37659c21a7e785589c383b688595be6.tar.bz2
Add support for getting the 256x256 app icon on Windows as a SkBitmap.
Also, adds an icon (a copy of chrome/app/theme/chromium/chromium.ico) to ui_unittests.exe, which is needed by the tests for this new functionality. The icon was landed here: https://codereview.chromium.org/11877018/ BUG=167277 TEST=New unit tests in icon_util_unittests.cc. Review URL: https://chromiumcodereview.appspot.com/11778073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui_unittests.gypi')
-rw-r--r--ui/ui_unittests.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index fdcbfc3..c9572f6 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -157,6 +157,7 @@
}],
['OS == "win"', {
'sources': [
+ 'test/ui_unittests.rc',
'base/dragdrop/os_exchange_data_win_unittest.cc',
'base/win/hwnd_subclass_unittest.cc',
'gfx/font_fallback_win_unittest.cc',