Chromium Code Reviews| Index: ash/wm/root_window_layout_manager.h |
| diff --git a/ash/wm/root_window_layout_manager.h b/ash/wm/root_window_layout_manager.h |
| index 78eee2b83bfb0d76437a7e964b059c94940e369f..94d8c8fef815dd8c6904ac9d939cdb3fff01b738 100644 |
| --- a/ash/wm/root_window_layout_manager.h |
| +++ b/ash/wm/root_window_layout_manager.h |
| @@ -5,6 +5,7 @@ |
| #ifndef ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ |
| #define ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ |
| +#include "ash/shell_window_ids.h" |
| #include "base/basictypes.h" |
| #include "base/compiler_specific.h" |
| #include "base/memory/scoped_ptr.h" |
| @@ -33,17 +34,12 @@ class RootWindowLayoutManager : public aura::LayoutManager { |
| explicit RootWindowLayoutManager(aura::Window* owner); |
| virtual ~RootWindowLayoutManager(); |
| - views::Widget* background_widget() { return background_widget_; } |
| - ui::Layer* background_layer() { return background_layer_.get(); } |
| - |
| - // Sets the background to |widget|. Closes and destroys the old widget if it |
| - // exists and differs from the new widget. |
| - void SetBackgroundWidget(views::Widget* widget); |
| - |
| - // Sets a background layer, taking ownership of |layer|. This is provided as |
| - // a lightweight alternative to SetBackgroundWidget(); layers can be simple |
| - // colored quads instead of being textured. |
| - void SetBackgroundLayer(ui::Layer* layer); |
| + views::Widget* background_widget() { |
| + return background_widget_[kShellWindowId_DesktopBackgroundContainer]; |
|
Nikita (slow)
2012/07/25 20:45:24
nit: fix indentation
Denis Kuznetsov (DE-MUC)
2012/07/26 13:51:13
Removed as not needed.
|
| + } |
| + ui::Layer* background_layer() { |
|
Nikita (slow)
2012/07/25 20:45:24
nit: fix indentation
Denis Kuznetsov (DE-MUC)
2012/07/26 13:51:13
Removed as not needed.
|
| + return background_layer_[kShellWindowId_DesktopBackgroundContainer].get(); |
|
Nikita (slow)
2012/07/25 20:45:24
Makes sense to move this implementation to .cc
Denis Kuznetsov (DE-MUC)
2012/07/26 13:51:13
Removed as not needed.
|
| + } |
| // Overridden from aura::LayoutManager: |
| virtual void OnWindowResized() OVERRIDE; |
| @@ -58,9 +54,9 @@ class RootWindowLayoutManager : public aura::LayoutManager { |
| private: |
| aura::Window* owner_; |
| - // May be NULL if we're not painting a background. |
| - views::Widget* background_widget_; |
| - scoped_ptr<ui::Layer> background_layer_; |
| + // May be NULL if we're not painting a background for that container. |
| + views::Widget* background_widget_[kShellWindowCount]; |
|
sky
2012/07/25 20:47:36
Do we need these changes?
Denis Kuznetsov (DE-MUC)
2012/07/26 13:51:13
Done.
|
| + scoped_ptr<ui::Layer> background_layer_[kShellWindowCount]; |
| DISALLOW_COPY_AND_ASSIGN(RootWindowLayoutManager); |
| }; |