Honor can_activate flag in ShowWindowWithState

ui/views/test/test_views_delegate.h

Index: ui/views/test/test_views_delegate.h
diff --git a/ui/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h
index 1d726f8f38dfb1828c4c4e8c09bf16c92eeea375..5d80e085e96de6a7e6773c3fbbcc553c88cf1bac 100644
--- a/ui/views/test/test_views_delegate.h
+++ b/ui/views/test/test_views_delegate.h
@@ -19,7 +19,16 @@ class TestViewsDelegate : public ViewsDelegate {
   TestViewsDelegate();
   virtual ~TestViewsDelegate();
 
-  void SetUseTransparentWindows(bool transparent);
+  // If set to |true|, forces widgets that do not provide a native widget to use
+  // DesktopNativeWidgetAura instead of whatever the default native widget would
+  // be. This has no effect on ChromeOS.
+  void set_use_desktop_native_widgets(bool desktop) {
+    use_desktop_native_widgets_ = desktop;
+  }
+
+  void set_use_transparent_windows(bool transparent) {
+    use_transparent_windows_ = transparent;
+  }
 
   // ViewsDelegate:
   virtual void OnBeforeWidgetInit(
@@ -27,6 +36,7 @@ class TestViewsDelegate : public ViewsDelegate {
       internal::NativeWidgetDelegate* delegate) OVERRIDE;
 
  private:
+  bool use_desktop_native_widgets_;
   bool use_transparent_windows_;
 #if defined(USE_AURA)
   scoped_ptr<wm::WMState> wm_state_;