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

ui/views/widget/widget_hwnd_utils.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_hwnd_utils.h"
 
 #include <dwmapi.h>
 
 #include "base/command_line.h"
 #include "base/win/windows_version.h"
@@ skipping 23 matching lines @@
 
   // Set type-independent style attributes.
   if (params.child)
     *style |= WS_CHILD;
   if (params.show_state == ui::SHOW_STATE_MAXIMIZED)
     *style |= WS_MAXIMIZE;
   if (params.show_state == ui::SHOW_STATE_MINIMIZED)
     *style |= WS_MINIMIZE;
   if (!params.accept_events)
     *ex_style |= WS_EX_TRANSPARENT;
-  DCHECK_NE(Widget::InitParams::ACTIVATABLE_DEFAULT, params.activatable);
-  if (params.activatable == Widget::InitParams::ACTIVATABLE_NO)
+  if (!params.can_activate)
     *ex_style |= WS_EX_NOACTIVATE;
   if (params.keep_on_top)
     *ex_style |= WS_EX_TOPMOST;
   if (params.mirror_origin_in_rtl)
     *ex_style |= l10n_util::GetExtendedTooltipStyles();
   // Layered windows do not work with Aura. They are basically incompatible
   // with Direct3D surfaces. Officially, it should be impossible to achieve
   // per-pixel alpha compositing with the desktop and 3D acceleration but it
   // has been discovered that since Vista There is a secret handshake between
   // user32 and the DMW. If things are set up just right DMW gets out of the
@@ skipping 97 matching lines @@
   DWORD class_style = 0;
   CalculateWindowStylesFromInitParams(params, widget_delegate,
                                       native_widget_delegate, &style, &ex_style,
                                       &class_style);
   handler->set_initial_class_style(class_style);
   handler->set_window_style(handler->window_style() | style);
   handler->set_window_ex_style(handler->window_ex_style() | ex_style);
 }
 
 }  // namespace views