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

Unified Diff: ui/views/focus/focus_manager_unittest.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/event_monitor_unittest.cc ('k') | ui/views/mus/mus_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/focus/focus_manager_unittest.cc
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index a655eafcc45e0c3d37abf43989a3f78704fc6db0..b1f5225ddbd8e1e6f57bde129c42cf3b3208f4e3 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -122,6 +122,12 @@ TEST_F(FocusManagerTest, FocusChangeListener) {
}
TEST_F(FocusManagerTest, WidgetFocusChangeListener) {
+ // TODO: this test ends up calling focus on the aura::Window associated with
+ // the Widget and expecting that to change activation. This should work for
+ // aura-mus-client as well. http://crbug.com/664261.
+ if (IsAuraMusClient())
+ return;
+
// First, ensure the simulator is aware of the Widget created in SetUp() being
// currently active.
test::WidgetTest::SimulateNativeActivate(GetWidget());
« no previous file with comments | « ui/views/event_monitor_unittest.cc ('k') | ui/views/mus/mus_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698