Refactors DimWindow and moves to ash/common

ash/wm/screen_dimmer.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/screen_dimmer.h"
 
+#include "ash/aura/wm_window_aura.h"
+#include "ash/common/wm/window_dimmer.h"
 #include "ash/common/wm_shell.h"
+#include "ash/common/wm_window_user_data.h"
 #include "ash/shell.h"
-#include "ash/wm/dim_window.h"
 #include "base/time/time.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_property.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::ScreenDimmer*);
 
@@ skipping 30 matching lines @@
   ScreenDimmer* dimmer = GetForContainer(kRootWindowMagicId);
   // Root window's dimmer
   dimmer->target_opacity_ = kDimmingLayerOpacityForRoot;
   return dimmer;
 }
 
 ScreenDimmer::ScreenDimmer(int container_id)
     : container_id_(container_id),
       target_opacity_(0.5f),
       is_dimming_(false),
-      at_bottom_(false) {
+      at_bottom_(false),
+      window_dimmers_(base::MakeUnique<WmWindowUserData<WindowDimmer>>()) {
   WmShell::Get()->AddShellObserver(this);
 }
 
 ScreenDimmer::~ScreenDimmer() {
   WmShell::Get()->RemoveShellObserver(this);
 }
 
 void ScreenDimmer::SetDimming(bool should_dim) {
   if (should_dim == is_dimming_)
     return;
@@ skipping 12 matching lines @@
   return container_id == kRootWindowMagicId
              ? primary
              : primary->GetChildById(container_id);
 }
 
 void ScreenDimmer::OnRootWindowAdded(WmWindow* root_window) {
   Update(is_dimming_);
 }
 
 void ScreenDimmer::Update(bool should_dim) {
-  for (aura::Window* container : GetAllContainers(container_id_)) {
-    DimWindow* dim = DimWindow::Get(container);
+  for (aura::Window* aura_container : GetAllContainers(container_id_)) {
+    WmWindow* container = WmWindowAura::Get(aura_container);
+    WindowDimmer* window_dimmer = window_dimmers_->Get(container);

[James Cook, 2016/09/09 21:33:37]

WDYT of WmWindowUserData::Get() being named either GetForWindow() or GetData()?

[sky, 2016/09/09 21:50:45]

I view WmWindowUserData close to a map, in which case set/get seems preferred.

     if (should_dim) {
-      if (!dim) {
-        dim = new DimWindow(container);
-        dim->SetDimOpacity(target_opacity_);
+      if (!window_dimmer) {
+        window_dimmers_->Set(container,
+                             base::MakeUnique<WindowDimmer>(container));
+        window_dimmer = window_dimmers_->Get(container);
+        window_dimmer->SetDimOpacity(target_opacity_);
       }
       if (at_bottom_)
-        dim->parent()->StackChildAtBottom(dim);
+        container->StackChildAtBottom(window_dimmer->window());
       else
-        dim->parent()->StackChildAtTop(dim);
-      dim->Show();
-    } else {
-      if (dim) {
-        dim->Hide();
-        delete dim;
-      }
+        container->StackChildAtTop(window_dimmer->window());
+      window_dimmer->window()->Show();
+    } else if (window_dimmer) {
+      window_dimmers_->Set(container, nullptr);
     }
   }
 }
 
 }  // namespace ash