summaryrefslogtreecommitdiffstats
path: root/chrome/interactive_ui_tests.isolate
diff options
context:
space:
mode:
authortapted <tapted@chromium.org>2015-03-17 14:28:24 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-17 21:29:01 +0000
commit3de6ad4c2b4c8f52daa2119a24063cd9309460e6 (patch)
treeefabd3548f24e8ff1a066e8cd5e1add2cb7007c4 /chrome/interactive_ui_tests.isolate
parent50442ee97f3212f38c8cbb29228293dfa1c17ce4 (diff)
downloadchromium_src-3de6ad4c2b4c8f52daa2119a24063cd9309460e6.zip
chromium_src-3de6ad4c2b4c8f52daa2119a24063cd9309460e6.tar.gz
chromium_src-3de6ad4c2b4c8f52daa2119a24063cd9309460e6.tar.bz2
MacViews: Implement Window-modal dialogs using sheets
These are used, e.g., for the Bookmark -> Edit... dialogs on Cocoa and Views. This gets WidgetTestInteractive.*Window*ModalWindowDestroyedActivationTest passing. WidgetTestInteractive.*System*ModalWindowReleasesCapture is disabled in this CL. System modal windows are not needed on Mac. Currently the implementation on MacViews assumes all modal dialogs are shown using a sheet. On Cocoa, this is not always true for WebContents-Modal dialogs (e.g. cookies and site data), but it is true for some WebContents-Modal dialogs (e.g. certificate information). A follow-up will add logic to ensure WebContents-Modal dialogs are handled appropriately, and have good test coverage. After this all tests pass on the current mac trybot configuration with toolkit_views=1. BUG=403679 Review URL: https://codereview.chromium.org/993253002 Cr-Commit-Position: refs/heads/master@{#320977}
Diffstat (limited to 'chrome/interactive_ui_tests.isolate')
-rw-r--r--chrome/interactive_ui_tests.isolate2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index 6ceb6c9..01c2675 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -55,6 +55,7 @@
'../third_party/tlslite/',
'<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/resources.pak',
+ '<(PRODUCT_DIR)/ui_test.pak',
'test/data/',
],
'read_only': 1,
@@ -66,7 +67,6 @@
'<(PRODUCT_DIR)/chrome_100_percent.pak',
'<(PRODUCT_DIR)/locales/en-US.pak',
'<(PRODUCT_DIR)/locales/fr.pak',
- '<(PRODUCT_DIR)/ui_test.pak',
],
},
}],