Don't activate POPUP window

views/widget/widget.cc

Index: views/widget/widget.cc
diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index 0e10047a96a0fc93fa9441a3371147dae03a2127..7f3081cb0f2a68e21c373883047aa68be89c0392 100644
--- a/views/widget/widget.cc
+++ b/views/widget/widget.cc
@@ -66,7 +66,11 @@ class ScopedEvent {
 // WidgetDelegate is supplied.
 class DefaultWidgetDelegate : public WidgetDelegate {
  public:
-  explicit DefaultWidgetDelegate(Widget* widget) : widget_(widget) {}
+  explicit DefaultWidgetDelegate(

[sadrul, 2011/08/26 16:21:36]

'explicit' not needed.

[oshima, 2011/08/26 17:20:28]

Done.

+      Widget* widget, const Widget::InitParams& params)
+      : widget_(widget),
+        can_activate_(params.type != Widget::InitParams::TYPE_POPUP) {
+  }
   virtual ~DefaultWidgetDelegate() {}
 
   // Overridden from WidgetDelegate:
@@ -80,8 +84,13 @@ class DefaultWidgetDelegate : public WidgetDelegate {
     return widget_;
   }
 
+  virtual bool CanActivate() const {
+    return can_activate_;

[oshima, 2011/08/25 22:55:53]

CanActivate is used only in native_widget_win.cc, and I'm not 100% certain if
this won't cause issue on windows. Please let me know if I should ifdef to non
windows.

[Ben Goodger (Google), 2011/08/25 23:12:44]

Shouldn't do.

[oshima, 2011/08/26 17:20:28]

ok

+  }
+
  private:
   Widget* widget_;
+  bool can_activate_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultWidgetDelegate);
 };
@@ -285,8 +294,8 @@ void Widget::Init(const InitParams& params) {
       (!params.child &&
        params.type != InitParams::TYPE_CONTROL &&
        params.type != InitParams::TYPE_TOOLTIP);
-  widget_delegate_ =
-      params.delegate ? params.delegate : new DefaultWidgetDelegate(this);
+  widget_delegate_ = params.delegate ?
+      params.delegate : new DefaultWidgetDelegate(this, params);
   ownership_ = params.ownership;
   native_widget_ = params.native_widget ?
       params.native_widget->AsNativeWidgetPrivate() :