Fix Widget::InitParams::activatable logic

ui/views/widget/widget.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/widget/widget.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 51 matching lines @@
   }
   return native_widget;
 }
 
 }  // namespace
 
 // A default implementation of WidgetDelegate, used by Widget when no
 // WidgetDelegate is supplied.
 class DefaultWidgetDelegate : public WidgetDelegate {
  public:
-  DefaultWidgetDelegate(Widget* widget, bool can_activate)
-      : widget_(widget),
-        can_activate_(can_activate) {
+  explicit DefaultWidgetDelegate(Widget* widget) : widget_(widget) {
   }
   virtual ~DefaultWidgetDelegate() {}
 
   // Overridden from WidgetDelegate:
   virtual void DeleteDelegate() OVERRIDE {
     delete this;
   }
   virtual Widget* GetWidget() OVERRIDE {
     return widget_;
   }
   virtual const Widget* GetWidget() const OVERRIDE {
     return widget_;
   }
-  virtual bool CanActivate() const OVERRIDE {
-    return can_activate_;
-  }
   virtual bool ShouldAdvanceFocusToTopLevelWidget() const OVERRIDE {
     // In most situations where a Widget is used without a delegate the Widget
     // is used as a container, so that we want focus to advance to the top-level
     // widget. A good example of this is the find bar.
     return true;
   }
 
  private:
   Widget* widget_;
-  bool can_activate_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultWidgetDelegate);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, InitParams:
 
 Widget::InitParams::InitParams()
     : type(TYPE_WINDOW),
       delegate(NULL),
@@ skipping 226 matching lines @@
 void Widget::Init(const InitParams& in_params) {
   TRACE_EVENT0("views", "Widget::Init");
   InitParams params = in_params;
 
   is_top_level_ = params.top_level ||
       (!params.child &&
        params.type != InitParams::TYPE_CONTROL &&
        params.type != InitParams::TYPE_TOOLTIP);
   params.top_level = is_top_level_;
 
-  if (params.activatable != InitParams::ACTIVATABLE_DEFAULT) {
-    can_activate_ = (params.activatable == InitParams::ACTIVATABLE_YES);
-  } else if (params.type != InitParams::TYPE_CONTROL &&
-             params.type != InitParams::TYPE_POPUP &&
-             params.type != InitParams::TYPE_MENU &&
-             params.type != InitParams::TYPE_TOOLTIP &&
-             params.type != InitParams::TYPE_DRAG) {
-    can_activate_ = true;
-    params.activatable = InitParams::ACTIVATABLE_YES;
-  } else {
-    can_activate_ = false;
-    params.activatable = InitParams::ACTIVATABLE_NO;
-  }
-
   if (params.opacity == views::Widget::InitParams::INFER_OPACITY &&
       params.type != views::Widget::InitParams::TYPE_WINDOW &&
       params.type != views::Widget::InitParams::TYPE_PANEL)
     params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
 
   if (ViewsDelegate::views_delegate)
     ViewsDelegate::views_delegate->OnBeforeWidgetInit(&params, this);
 
   if (params.opacity == views::Widget::InitParams::INFER_OPACITY)
     params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
 
+  bool can_activate = false;
+  if (params.activatable != InitParams::ACTIVATABLE_DEFAULT) {
+    can_activate = (params.activatable == InitParams::ACTIVATABLE_YES);
+  } else if (params.type != InitParams::TYPE_CONTROL &&
+             params.type != InitParams::TYPE_POPUP &&
+             params.type != InitParams::TYPE_MENU &&
+             params.type != InitParams::TYPE_TOOLTIP &&
+             params.type != InitParams::TYPE_DRAG) {
+    can_activate = true;
+    params.activatable = InitParams::ACTIVATABLE_YES;
+  } else {
+    can_activate = false;
+    params.activatable = InitParams::ACTIVATABLE_NO;
+  }
+
   widget_delegate_ = params.delegate ?
-      params.delegate : new DefaultWidgetDelegate(this, can_activate_);
+      params.delegate : new DefaultWidgetDelegate(this);
+  widget_delegate_->set_can_activate(can_activate);
+
   ownership_ = params.ownership;
   native_widget_ = CreateNativeWidget(params.native_widget, this)->
                    AsNativeWidgetPrivate();
   root_view_.reset(CreateRootView());
   default_theme_provider_.reset(new ui::DefaultThemeProvider);
   if (params.type == InitParams::TYPE_MENU) {
     is_mouse_button_pressed_ =
         internal::NativeWidgetPrivate::IsMouseButtonDown();
   }
   native_widget_->InitNativeWidget(params);
@@ skipping 628 matching lines @@
 
 bool Widget::IsModal() const {
   return widget_delegate_->GetModalType() != ui::MODAL_TYPE_NONE;
 }
 
 bool Widget::IsDialogBox() const {
   return !!widget_delegate_->AsDialogDelegate();
 }
 
 bool Widget::CanActivate() const {
-  return can_activate_ && widget_delegate_->CanActivate();
+  return widget_delegate_->CanActivate();
 }
 
 bool Widget::IsInactiveRenderingDisabled() const {
   return disable_inactive_rendering_;
 }
 
 void Widget::EnableInactiveRendering() {
   SetInactiveRenderingDisabled(false);
 }
 
@@ skipping 481 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views