Make power button controller restore to original transformation on the layer.

ash/wm/power_button_controller.h

Index: ash/wm/power_button_controller.h
diff --git a/ash/wm/power_button_controller.h b/ash/wm/power_button_controller.h
index 9b069b536d92253896dc22e3feef07793c6380b4..6dcec6c3b085d891f402216252201645060849f7 100644
--- a/ash/wm/power_button_controller.h
+++ b/ash/wm/power_button_controller.h
@@ -6,12 +6,15 @@
 #define ASH_WM_POWER_BUTTON_CONTROLLER_H_
 #pragma once
 
+#include <map>
+
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "ui/aura/root_window_observer.h"
+#include "ui/aura/window.h"

[Daniel Erat, 2012/02/15 05:50:03]

forward-declare aura::Window instead of including the header

[alicet1, 2012/02/15 20:48:53]

I lifted GetContainers up to class, and so it needs aura::Window::Windows from
the header also.

 
 namespace gfx {
 class Size;
@@ -19,10 +22,14 @@ class Size;
 
 namespace ui {
 class Layer;
+class Transform;
 }
 
 namespace ash {
 
+typedef std::map<aura::Window*, ui::Transform> WindowTransformsMap;

[Daniel Erat, 2012/02/15 05:50:03]

move this inside of the class, in the private block

[alicet1, 2012/02/15 20:48:53]

Done.

+typedef WindowTransformsMap::const_iterator WindowTransformsConstIter;

[Daniel Erat, 2012/02/15 05:50:03]

don't put this in the header; you don't use it there (or better, just delete it,
since you only use it once)

[alicet1, 2012/02/15 20:48:53]

Done.

+
 // Performs system-related functions on behalf of PowerButtonController.
 class ASH_EXPORT PowerButtonControllerDelegate {
  public:
@@ -118,6 +125,9 @@ class ASH_EXPORT PowerButtonController : public aura::RootWindowObserver {
     // Returns true if |background_layer_| is non-NULL and visible.
     bool BackgroundLayerIsVisible() const;
 
+    // Returns the set of |windows| in a container |group|.
+    void GetContainerWindows(ContainerGroup group,

[Daniel Erat, 2012/02/15 05:50:03]

this name (and especially the comment) are misleading.  GetContainersInGroup()
instead?

[alicet1, 2012/02/15 20:48:53]

removed.

I moved GetContainers to public, either that or make unittest class be a friend
class of power button controller if we ant to keep it private. I am fine either
ways, this added method doesn't do more than recall the real GetContainers(), so
I'd rather not have it.

+                             aura::Window::Windows* windows);
    private:
     PowerButtonController* controller_;  // not owned
 
@@ -235,6 +245,9 @@ class ASH_EXPORT PowerButtonController : public aura::RootWindowObserver {
   // screen.
   base::OneShotTimer<PowerButtonController> hide_background_layer_timer_;
 
+  // Map of window and their corresponding layer transform before animation.

[Daniel Erat, 2012/02/15 05:50:03]

// Map from containers to their original layer transforms before we started
animating them.

[alicet1, 2012/02/15 20:48:53]

Done.

+  WindowTransformsMap window_transforms_;

[Daniel Erat, 2012/02/15 05:50:03]

rename to container_transforms_

[alicet1, 2012/02/15 20:48:53]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(PowerButtonController);
 };