Renames WmWindowUserData and converts to using aura

ash/common/wm/system_modal_container_layout_manager.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/common/wm/system_modal_container_layout_manager.h"
 
 #include <cmath>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm/window_dimmer.h"
@@ skipping 142 matching lines @@
 
 bool SystemModalContainerLayoutManager::ActivateNextModalWindow() {
   if (modal_windows_.empty())
     return false;
   modal_window()->Activate();
   return true;
 }
 
 void SystemModalContainerLayoutManager::CreateModalBackground() {
   if (!window_dimmer_) {
-    window_dimmer_ = base::MakeUnique<WindowDimmer>(container_);
+    window_dimmer_ = base::MakeUnique<WindowDimmer>(container_->aura_window());
     window_dimmer_->window()->SetName(
         "SystemModalContainerLayoutManager.ModalBackground");
     // There isn't always a keyboard controller.
     if (keyboard::KeyboardController::GetInstance())
       keyboard::KeyboardController::GetInstance()->AddObserver(this);
   }
   window_dimmer_->window()->Show();
 }
 
 void SystemModalContainerLayoutManager::DestroyModalBackground() {
   if (!window_dimmer_)
     return;
 
   if (keyboard::KeyboardController::GetInstance())
     keyboard::KeyboardController::GetInstance()->RemoveObserver(this);
   window_dimmer_.reset();
 }
 
 // static
 bool SystemModalContainerLayoutManager::IsModalBackground(WmWindow* window) {
   int id = window->GetParent()->GetShellWindowId();
   if (id != kShellWindowId_SystemModalContainer &&
       id != kShellWindowId_LockSystemModalContainer)
     return false;
   SystemModalContainerLayoutManager* layout_manager =
       static_cast<SystemModalContainerLayoutManager*>(
           window->GetParent()->GetLayoutManager());
   return layout_manager->window_dimmer_ &&
-         layout_manager->window_dimmer_->window() == window;
+         WmWindow::Get(layout_manager->window_dimmer_->window()) == window;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SystemModalContainerLayoutManager, private:
 
 void SystemModalContainerLayoutManager::AddModalWindow(WmWindow* window) {
   if (modal_windows_.empty()) {
     WmWindow* capture_window = WmShell::Get()->GetCaptureWindow();
     if (capture_window)
       capture_window->ReleaseCapture();
@@ skipping 68 matching lines @@
 bool SystemModalContainerLayoutManager::IsBoundsCentered(
     const gfx::Rect& bounds) const {
   gfx::Point window_center = bounds.CenterPoint();
   gfx::Point container_center = GetUsableDialogArea().CenterPoint();
   return std::abs(window_center.x() - container_center.x()) <
              kCenterPixelDelta &&
          std::abs(window_center.y() - container_center.y()) < kCenterPixelDelta;
 }
 
 }  // namespace ash