mus: Don't activate non-activatable widgets on Show()

ui/views/mus/native_widget_mus_unittest.cc

Index: ui/views/mus/native_widget_mus_unittest.cc
diff --git a/ui/views/mus/native_widget_mus_unittest.cc b/ui/views/mus/native_widget_mus_unittest.cc
index e987d2cc29162123d09677ff91b013103dd92b9c..0ed22b8ee57c8399589b14f008c57ec280086237 100644
--- a/ui/views/mus/native_widget_mus_unittest.cc
+++ b/ui/views/mus/native_widget_mus_unittest.cc
@@ -132,6 +132,26 @@ TEST_F(NativeWidgetMusTest, OnActivationChanged) {
   WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(&focus_listener);
 }
 
+// Tests that showing a non-activatable widget does not activate it.
+// TODO(jamescook): Remove this test when widget_interactive_uittests.cc runs
+// under mus.
+TEST_F(NativeWidgetMusTest, ShowNonActivatableWidget) {
+  Widget widget;
+  WidgetActivationObserver activation_observer(&widget);
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_BUBBLE);
+  params.activatable = Widget::InitParams::ACTIVATABLE_NO;
+  params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  params.bounds = gfx::Rect(10, 20, 100, 200);
+  widget.Init(params);
+  widget.Show();
+
+  // The widget is not currently active.
+  EXPECT_FALSE(widget.IsActive());
+
+  // The widget was never active.
+  EXPECT_EQ(0u, activation_observer.changes().size());
+}
+
 // Tests that a window with an icon sets the mus::Window icon property.
 TEST_F(NativeWidgetMusTest, AppIcon) {
   // Create a Widget with a bitmap as the icon.