Honor can_activate flag in ShowWindowWithState

ui/views/test/test_views_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/test/test_views_delegate.h"
 
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/wm/core/wm_state.h"
 
 
 namespace views {
 
 TestViewsDelegate::TestViewsDelegate()
-    : use_transparent_windows_(false) {
+    : use_desktop_native_widgets_(false),
+      use_transparent_windows_(false) {
   DCHECK(!ViewsDelegate::views_delegate);
   ViewsDelegate::views_delegate = this;
   wm_state_.reset(new wm::WMState);
 }
 
 TestViewsDelegate::~TestViewsDelegate() {
   if (ViewsDelegate::views_delegate == this)
     ViewsDelegate::views_delegate = NULL;
 }
 
+void TestViewsDelegate::SetUseDesktopNativeWidgets(bool desktop) {
+  use_desktop_native_widgets_ = desktop;
+}
+
 void TestViewsDelegate::SetUseTransparentWindows(bool transparent) {
   use_transparent_windows_ = transparent;
 }
 
 void TestViewsDelegate::OnBeforeWidgetInit(
     Widget::InitParams* params,
     internal::NativeWidgetDelegate* delegate) {
   if (params->opacity == Widget::InitParams::INFER_OPACITY) {
     params->opacity = use_transparent_windows_ ?
         Widget::InitParams::TRANSLUCENT_WINDOW :
         Widget::InitParams::OPAQUE_WINDOW;
   }
+#if !defined(OS_CHROMEOS)
+  if (use_desktop_native_widgets_)

[sky, 2014/05/15 16:44:01]

Only do this if params->native_widget is NULL.

[mohsen, 2014/05/16 15:56:09]

Done.

+    params->native_widget = new DesktopNativeWidgetAura(delegate);
+#endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace views