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

Unified Diff: ui/views/widget/widget_interactive_uitest.cc

Issue 2488393003: Changes views_aura_mus_unittests to create DesktopNativeWidgetAura (Closed)
Patch Set: remove this and fix mac Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/native_widget_unittest.cc ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget_interactive_uitest.cc
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index 1deab16452760b0798a476ac056518630f6b9446..8af4ce48c1eaa6dbf9e6f645170f6f2bade34141 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -1197,6 +1197,11 @@ TEST_F(WidgetTestInteractive, MAYBE_ExitFullscreenRestoreState) {
// Testing initial focus is assigned properly for normal top-level widgets,
// and subclasses that specify a initially focused child view.
TEST_F(WidgetTestInteractive, InitialFocus) {
+ // TODO: test uses GetContext(), which is not applicable to aura-mus.
+ // http://crbug.com/663809.
+ if (IsAuraMusClient())
+ return;
+
// By default, there is no initially focused view (even if there is a
// focusable subview).
Widget* toplevel(CreateTopLevelPlatformWidget());
@@ -1408,6 +1413,10 @@ TEST_F(WidgetCaptureTest, FailedCaptureRequestIsNoop) {
// Fails on mus. http://crbug.com/611764
if (IsMus())
return;
+ // TODO: test uses GetContext(), which is not applicable to aura-mus.
+ // http://crbug.com/663809.
+ if (IsAuraMusClient())
+ return;
Widget widget;
Widget::InitParams params =
« no previous file with comments | « ui/views/widget/native_widget_unittest.cc ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698