Don't activate POPUP window

views/widget/widget.cc

 // Copyright (c) 2011 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 "views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_font_util.h"
@@ skipping 48 matching lines @@
   Widget* widget_;
   const Event* event_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedEvent);
 };
 
 // A default implementation of WidgetDelegate, used by Widget when no
 // 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:
   virtual void DeleteDelegate() OVERRIDE {
     delete this;
   }
   virtual Widget* GetWidget() {
     return widget_;
   }
   virtual const Widget* GetWidget() const {
     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);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, InitParams:
 
 Widget::InitParams::InitParams()
     : type(TYPE_WINDOW),
       delegate(NULL),
@@ skipping 183 matching lines @@
 // static
 bool Widget::IsDebugPaintEnabled() {
   return debug_paint;
 }
 
 void Widget::Init(const InitParams& params) {
   is_top_level_ = params.top_level ||
       (!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() :
       internal::NativeWidgetPrivate::CreateNativeWidget(this);
   GetRootView();
   default_theme_provider_.reset(new DefaultThemeProvider);
   if (params.type == InitParams::TYPE_MENU) {
     is_mouse_button_pressed_ =
         internal::NativeWidgetPrivate::IsMouseButtonDown();
   }
@@ skipping 834 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views