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

ash/magnifier/partial_magnification_controller.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/magnifier/partial_magnification_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ skipping 126 matching lines @@
     return;
 
   root_window->AddObserver(this);
 
   gfx::Point mouse(
       root_window->GetHost()->dispatcher()->GetLastMouseLocationInRoot());
 
   zoom_widget_ = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
+  params.can_activate = false;
   params.accept_events = false;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.parent = root_window;
   zoom_widget_->Init(params);
   zoom_widget_->SetBounds(gfx::Rect(mouse.x() - kMagnifierWidth / 2,
                                     mouse.y() - kMagnifierHeight / 2,
                                     kMagnifierWidth, kMagnifierHeight));
   zoom_widget_->set_focus_on_creation(false);
   zoom_widget_->Show();
 
@@ skipping 46 matching lines @@
        iter != root_windows.end(); ++iter) {
     aura::Window* root_window = *iter;
     if (root_window->ContainsPointInRoot(
             root_window->GetHost()->dispatcher()->GetLastMouseLocationInRoot()))
       return root_window;
   }
   return NULL;
 }
 
 }  // namespace ash