Index: ash/wm/root_window_layout_manager.cc |
diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc |
index 52c117e322a3f4b6285eef05326575ce8eb635f2..cc3d9112de99a2c2c0212e13864ec1f3506903ce 100644 |
--- a/ash/wm/root_window_layout_manager.cc |
+++ b/ash/wm/root_window_layout_manager.cc |
@@ -3,6 +3,7 @@ |
// found in the LICENSE file. |
#include "ash/wm/root_window_layout_manager.h" |
+#include "ash/desktop_background/desktop_background_component.h" |
Nikita (slow)
2012/07/25 20:45:24
nit: This header should go with the next group.
Denis Kuznetsov (DE-MUC)
2012/07/26 13:51:13
Done.
|
#include "ui/aura/window.h" |
#include "ui/compositor/layer.h" |
@@ -15,25 +16,12 @@ namespace internal { |
// RootWindowLayoutManager, public: |
RootWindowLayoutManager::RootWindowLayoutManager(aura::Window* owner) |
- : owner_(owner), |
- background_widget_(NULL) { |
+ : owner_(owner) { |
} |
RootWindowLayoutManager::~RootWindowLayoutManager() { |
} |
-void RootWindowLayoutManager::SetBackgroundWidget(views::Widget* widget) { |
- if (widget == background_widget_) |
- return; |
- // Close now so that the focus manager will be deleted before shutdown. |
- if (background_widget_) |
- background_widget_->CloseNow(); |
- background_widget_ = widget; |
-} |
- |
-void RootWindowLayoutManager::SetBackgroundLayer(ui::Layer* layer) { |
- background_layer_.reset(layer); |
-} |
//////////////////////////////////////////////////////////////////////////////// |
// RootWindowLayoutManager, aura::LayoutManager implementation: |
@@ -51,11 +39,10 @@ void RootWindowLayoutManager::OnWindowResized() { |
for (j = (*i)->children().begin(); j != (*i)->children().end(); ++j) |
(*j)->SetBounds(fullscreen_bounds); |
} |
- |
- if (background_widget_) |
- background_widget_->SetBounds(fullscreen_bounds); |
- if (background_layer_.get()) |
- background_layer_->SetBounds(fullscreen_bounds); |
+ internal::DesktopBackgroundComponent* component = owner_-> |
Nikita (slow)
2012/07/25 20:45:24
nit: Place owner_->GetProperty() on the same line.
Denis Kuznetsov (DE-MUC)
2012/07/26 13:51:13
Done.
|
+ GetProperty(internal::kWindowDesktopComponent); |
+ if (component) |
+ component->SetBounds(fullscreen_bounds); |
} |
void RootWindowLayoutManager::OnWindowAddedToLayout(aura::Window* child) { |