Revert 271468 "Revert of [Refactor] Consolidate the logic for wh..."

trunk/src/ash/wm/gestures/long_press_affordance_handler.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 "ash/wm/gestures/long_press_affordance_handler.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 45 matching lines @@
 const SkColor kAffordanceGlowEndColor = SkColorSetARGB(0, 255, 255, 255);
 const SkColor kAffordanceArcColor = SkColorSetARGB(80, 0, 0, 0);
 const int kAffordanceFrameRateHz = 60;
 
 views::Widget* CreateAffordanceWidget(aura::Window* root_window) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   params.keep_on_top = true;
   params.accept_events = false;
-  params.can_activate = false;
+  params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.context = root_window;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   widget->Init(params);
   widget->SetOpacity(0xFF);
   GetRootWindowController(root_window)->GetContainer(
       kShellWindowId_OverlayContainer)->AddChild(widget->GetNativeWindow());
   return widget;
 }
 
@@ skipping 281 matching lines @@
       break;
   }
 }
 
 void LongPressAffordanceHandler::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(tap_down_target_, window);
   StopAffordance();
 }
 
 }  // namespace ash