aura: Add Layer::LAYER_SOLID_COLOR to compositor.

ash/wm/power_button_controller.h

 // 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.
 
 #ifndef ASH_WM_POWER_BUTTON_CONTROLLER_H_
 #define ASH_WM_POWER_BUTTON_CONTROLLER_H_
 #pragma once
 
 #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"
 
 namespace gfx {
 class Size;
 }
 
 namespace ui {
 class Layer;
-class LayerDelegate;
 }
 
 namespace ash {
 
 // Performs system-related functions on behalf of PowerButtonController.
 class ASH_EXPORT PowerButtonControllerDelegate {
  public:
   PowerButtonControllerDelegate() {}
   virtual ~PowerButtonControllerDelegate() {}
 
@@ skipping 114 matching lines @@
   void OnStartingLock();
 
   // Called when the power or lock buttons are pressed or released.
   void OnPowerButtonEvent(bool down, const base::TimeTicks& timestamp);
   void OnLockButtonEvent(bool down, const base::TimeTicks& timestamp);
 
   // aura::RootWindowObserver overrides:
   virtual void OnRootWindowResized(const gfx::Size& new_size) OVERRIDE;
 
  private:
-  class BackgroundLayerDelegate;
-
   // Requests that the screen be locked and starts |lock_fail_timer_|.
   void OnLockTimeout();
 
   // Aborts the pre-lock animation.
   void OnLockFailTimeout();
 
   // Displays the pre-shutdown animation and starts |shutdown_timer_|.
   void OnLockToShutdownTimeout();
 
   // Displays the shutdown animation and starts |real_shutdown_timer_|.
@@ skipping 27 matching lines @@
   bool shutting_down_;
 
   // Should we start |shutdown_timer_| when we receive notification that the
   // screen has been locked?
   bool should_start_shutdown_timer_after_lock_;
 
   // Was a command-line switch set telling us that we're running on hardware
   // that misreports power button releases?
   bool has_legacy_power_button_;
 
-  // Responsible for painting |background_layer_|.
-  scoped_ptr<BackgroundLayerDelegate> background_layer_delegate_;
-
   // Layer that's stacked under all of the root window's children to provide a
   // black background when we're scaling all of the other windows down.
   scoped_ptr<ui::Layer> background_layer_;
 
   // Started when the user first presses the power button while in a
   // logged-in-as-a-non-guest-user, unlocked state.  When it fires, we lock the
   // screen.
   base::OneShotTimer<PowerButtonController> lock_timer_;
 
   // Started when we request that the screen be locked.  When it fires, we
@@ skipping 18 matching lines @@
   // |background_layer_|, as the desktop background is now covering the whole
   // screen.
   base::OneShotTimer<PowerButtonController> hide_background_layer_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerButtonController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_POWER_BUTTON_CONTROLLER_H_