Revert of [Refactor] Consolidate the logic for whether a widget can be activated. (https://codereview.chromium.org/286733002/)

Reason for revert:
This CL was causing problems when the value of views::Widget::CanActivate() changes crbug.com/374095

I also need to audit the code to find out whether there are any 'non-activatable' widgets which were intended to be activatable

Original issue's description:
> [Refactor] Consolidate the logic for whether a widget can be activated.
>
> This is a first step towards giving tooltips their own WindowTreeHosts on Linux.
>
> BUG=353533
> TEST=None
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270597

Review URL: https://codereview.chromium.org/297503003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271468 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 2 deletions

diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc
index 38c7cb2..9784d12 100644
--- a/ui/views/bubble/bubble_delegate.cc
+++ b/ui/views/bubble/bubble_delegate.cc
@@ -35,8 +35,7 @@ Widget* CreateBubbleWidget(BubbleDelegateView* bubble) {
     bubble_params.parent = bubble->parent_window();
   else if (bubble->anchor_widget())
     bubble_params.parent = bubble->anchor_widget()->GetNativeView();
-  bubble_params.activatable = bubble->CanActivate() ?
-      Widget::InitParams::ACTIVATABLE_YES : Widget::InitParams::ACTIVATABLE_NO;
+  bubble_params.can_activate = bubble->CanActivate();
   bubble->OnBeforeBubbleWidgetInit(&bubble_params, bubble_widget);
   bubble_widget->Init(bubble_params);
   return bubble_widget;