Revert: [Refactor] Consolidate the logic for whether a widget can be activated. This is a first ste

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)
+  DefaultWidgetDelegate(Widget* widget, const Widget::InitParams& params)
       : widget_(widget),
-        can_activate_(can_activate) {
+        can_activate_(!params.child &&
+                      params.type != Widget::InitParams::TYPE_POPUP &&
+                      params.type != Widget::InitParams::TYPE_DRAG) {
   }
   virtual ~DefaultWidgetDelegate() {}
 
   // Overridden from WidgetDelegate:
   virtual void DeleteDelegate() OVERRIDE {
     delete this;
   }
   virtual Widget* GetWidget() OVERRIDE {
     return widget_;
   }
@@ skipping 19 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, InitParams:
 
 Widget::InitParams::InitParams()
     : type(TYPE_WINDOW),
       delegate(NULL),
       child(false),
       opacity(INFER_OPACITY),
       accept_events(true),
-      activatable(ACTIVATABLE_DEFAULT),
+      can_activate(true),
       keep_on_top(false),
       visible_on_all_workspaces(false),
       ownership(NATIVE_WIDGET_OWNS_WIDGET),
       mirror_origin_in_rtl(false),
       has_dropshadow(false),
       remove_standard_frame(false),
       use_system_default_icon(false),
       show_state(ui::SHOW_STATE_DEFAULT),
       double_buffer(false),
       parent(NULL),
       native_widget(NULL),
       desktop_window_tree_host(NULL),
       top_level(false),
       layer_type(aura::WINDOW_LAYER_TEXTURED),
       context(NULL),
       force_show_in_taskbar(false) {
 }
 
 Widget::InitParams::InitParams(Type type)
     : type(type),
       delegate(NULL),
       child(type == TYPE_CONTROL),
       opacity(INFER_OPACITY),
       accept_events(true),
-      activatable(ACTIVATABLE_DEFAULT),
+      can_activate(type != TYPE_POPUP && type != TYPE_MENU &&
+                   type != TYPE_DRAG),
       keep_on_top(type == TYPE_MENU || type == TYPE_DRAG),
       visible_on_all_workspaces(false),
       ownership(NATIVE_WIDGET_OWNS_WIDGET),
       mirror_origin_in_rtl(false),
       has_dropshadow(false),
       remove_standard_frame(false),
       use_system_default_icon(false),
       show_state(ui::SHOW_STATE_DEFAULT),
       double_buffer(false),
       parent(NULL),
@@ skipping 187 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;
 
   widget_delegate_ = params.delegate ?
-      params.delegate : new DefaultWidgetDelegate(this, can_activate_);
+      params.delegate : new DefaultWidgetDelegate(this, params);
   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