summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame.gyp
diff options
context:
space:
mode:
authorkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 21:26:34 +0000
committerkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 21:26:34 +0000
commit586b3b0b16308c37fbf19f072dd82a448f456155 (patch)
tree4898b2914f167deabcddddc3f41e7bcacf1cd054 /chrome_frame/chrome_frame.gyp
parent4a729ae7ff3f615214d2120a2218a5bef4742c58 (diff)
downloadchromium_src-586b3b0b16308c37fbf19f072dd82a448f456155.zip
chromium_src-586b3b0b16308c37fbf19f072dd82a448f456155.tar.gz
chromium_src-586b3b0b16308c37fbf19f072dd82a448f456155.tar.bz2
[chrome_frame] Add methods for finding and performing default action on Accessibility objects. Use this approach in one test.
BUG=none TEST=none Review URL: http://codereview.chromium.org/2895016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
-rw-r--r--chrome_frame/chrome_frame.gyp42
1 files changed, 31 insertions, 11 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index b517f51..7d36d33 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -152,8 +152,8 @@
'test/urlmon_moniker_tests.h',
'test/urlmon_moniker_unittest.cc',
'test/util_unittests.cc',
- 'test/window_watchdog.h',
- 'test/window_watchdog.cc',
+ 'test/win_event_receiver.h',
+ 'test/win_event_receiver.cc',
'unittest_precompile.h',
'unittest_precompile.cc',
'urlmon_upload_data_stream.cc',
@@ -172,7 +172,7 @@
['OS=="win"', {
'link_settings': {
'libraries': [
- '-lshdocvw.lib',
+ '-lshdocvw.lib', '-loleacc.lib',
],
},
'msvs_settings': {
@@ -246,8 +246,8 @@
'test/urlmon_moniker_tests.h',
'test/urlmon_moniker_integration_test.cc',
'test/url_request_test.cc',
- 'test/window_watchdog.cc',
- 'test/window_watchdog.h',
+ 'test/win_event_receiver.cc',
+ 'test/win_event_receiver.h',
'chrome_tab.h',
'chrome_tab.idl',
'test_utils.cc',
@@ -264,6 +264,11 @@
],
'conditions': [
['OS=="win"', {
+ 'link_settings': {
+ 'libraries': [
+ '-loleacc.lib',
+ ],
+ },
'msvs_settings': {
'VCLinkerTool': {
'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'],
@@ -317,8 +322,8 @@
'test/simulate_input.h',
'test_utils.cc',
'test_utils.h',
- 'test/window_watchdog.cc',
- 'test/window_watchdog.h',
+ 'test/win_event_receiver.cc',
+ 'test/win_event_receiver.h',
],
'include_dirs': [
'<@(xul_include_directories)',
@@ -328,6 +333,11 @@
],
'conditions': [
['OS=="win"', {
+ 'link_settings': {
+ 'libraries': [
+ '-loleacc.lib',
+ ],
+ },
'dependencies': [
'../breakpad/breakpad.gyp:breakpad_handler',
'../chrome/chrome.gyp:automation',
@@ -370,8 +380,8 @@
'test/simulate_input.h',
'test/test_server.cc',
'test/test_server.h',
- 'test/window_watchdog.cc',
- 'test/window_watchdog.h',
+ 'test/win_event_receiver.cc',
+ 'test/win_event_receiver.h',
'test/net/fake_external_tab.cc',
'test/net/fake_external_tab.h',
'test/net/process_singleton_subclass.cc',
@@ -389,6 +399,11 @@
],
'conditions': [
['OS=="win"', {
+ 'link_settings': {
+ 'libraries': [
+ '-loleacc.lib',
+ ],
+ },
'msvs_settings': {
'VCLinkerTool': {
'DelayLoadDLLs': ['prntvpt.dll'],
@@ -438,8 +453,8 @@
'test_utils.h',
'test/simulate_input.cc',
'test/simulate_input.h',
- 'test/window_watchdog.cc',
- 'test/window_watchdog.h',
+ 'test/win_event_receiver.cc',
+ 'test/win_event_receiver.h',
'chrome_tab.h',
'chrome_tab.idl',
'../base/test/test_file_util_win.cc',
@@ -458,6 +473,11 @@
],
'conditions': [
['OS=="win"', {
+ 'link_settings': {
+ 'libraries': [
+ '-loleacc.lib',
+ ],
+ },
'dependencies': [
# TODO(slightlyoff): Get automation targets working on OS X
'../chrome/chrome.gyp:automation',