| Index: ash/wm/power_button_controller.h
|
| diff --git a/ash/wm/power_button_controller.h b/ash/wm/power_button_controller.h
|
| index 1fc12c764d7025ba4a8e22a8ee41d8807f2e5620..2070143e0a4d2b1d7c0937f6786bac8e35f5b3fd 100644
|
| --- a/ash/wm/power_button_controller.h
|
| +++ b/ash/wm/power_button_controller.h
|
| @@ -6,15 +6,12 @@
|
| #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"
|
|
|
| namespace gfx {
|
| class Size;
|
| @@ -22,7 +19,6 @@ class Size;
|
|
|
| namespace ui {
|
| class Layer;
|
| -class Transform;
|
| }
|
|
|
| namespace ash {
|
| @@ -159,10 +155,6 @@ class ASH_EXPORT PowerButtonController : public aura::RootWindowObserver {
|
| // Displays the shutdown animation and requests shutdown when it's done.
|
| void RequestShutdown();
|
|
|
| - // Fills |containers| with the containers described by |group|.
|
| - void GetContainers(ContainerGroup group,
|
| - aura::Window::Windows* containers);
|
| -
|
| // aura::RootWindowObserver overrides:
|
| virtual void OnRootWindowResized(const gfx::Size& new_size) OVERRIDE;
|
|
|
| @@ -196,12 +188,6 @@ class ASH_EXPORT PowerButtonController : public aura::RootWindowObserver {
|
| void ShowBackgroundLayer();
|
| void HideBackgroundLayer();
|
|
|
| - // Apply animation |type| to all containers described by |group|.
|
| - void StartAnimation(ContainerGroup group, AnimationType type);
|
| -
|
| - // Retrieve original transform for |window| stored before animation started.
|
| - ui::Transform RetrieveOriginalTransform(aura::Window* window);
|
| -
|
| scoped_ptr<PowerButtonControllerDelegate> delegate_;
|
|
|
| // True if the user is currently logged in.
|
| @@ -264,10 +250,6 @@ class ASH_EXPORT PowerButtonController : public aura::RootWindowObserver {
|
| // screen.
|
| base::OneShotTimer<PowerButtonController> hide_background_layer_timer_;
|
|
|
| - // Map from containers to their original layer transforms before animation.
|
| - typedef std::map<aura::Window*, ui::Transform> WindowTransformsMap;
|
| - WindowTransformsMap container_transforms_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(PowerButtonController);
|
| };
|
|
|
|
|