summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 08:16:39 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 08:16:39 +0000
commit3240c4c924ad029cf1b06a74531cdfaa53d58718 (patch)
tree56b17f089d3712af41b4b602deef9a1b7f6286f4 /chrome_frame
parent7a4d7c946a6062141e42ba69dd257ecf575fde5d (diff)
downloadchromium_src-3240c4c924ad029cf1b06a74531cdfaa53d58718.zip
chromium_src-3240c4c924ad029cf1b06a74531cdfaa53d58718.tar.gz
chromium_src-3240c4c924ad029cf1b06a74531cdfaa53d58718.tar.bz2
Include the UI resources in the Chrome Frame net tests since icons are now required in order to navigate tabs.
BUG=chrome_frame_net_tests.exe stop DCHECKing on the try servers TEST=NONE Review URL: http://codereview.chromium.org/7482002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index d6d3b56..1e39ceb 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -383,6 +383,7 @@
'../testing/gtest.gyp:gtest',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
+ '../ui/ui.gyp:ui_resources',
'chrome_frame_ie',
'chrome_tab_idl',
'npchrome_frame',
@@ -409,6 +410,7 @@
'test/net/test_automation_resource_message_filter.cc',
'test/net/test_automation_resource_message_filter.h',
'<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'test_utils.cc',
'test_utils.h',
],