Index: athena/screen/screen_manager_impl.cc |
diff --git a/athena/screen/screen_manager_impl.cc b/athena/screen/screen_manager_impl.cc |
index 3877e413f5d4b7b7ab455c9e9e68b9755f465d73..b4cc58fd3568d611a300e73d01742c9b8f49ccca 100644 |
--- a/athena/screen/screen_manager_impl.cc |
+++ b/athena/screen/screen_manager_impl.cc |
@@ -7,7 +7,6 @@ |
#include "athena/common/container_priorities.h" |
#include "athena/common/fill_layout_manager.h" |
#include "athena/input/public/accelerator_manager.h" |
-#include "athena/screen/background_controller.h" |
#include "athena/screen/screen_accelerator_handler.h" |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
@@ -202,14 +201,11 @@ class ScreenManagerImpl : public ScreenManager { |
const ContainerParams& params) OVERRIDE; |
virtual aura::Window* CreateContainer(const ContainerParams& params) OVERRIDE; |
virtual aura::Window* GetContext() OVERRIDE { return root_window_; } |
- virtual void SetBackgroundImage(const gfx::ImageSkia& image) OVERRIDE; |
virtual void SetRotation(gfx::Display::Rotation rotation) OVERRIDE; |
virtual ui::LayerAnimator* GetScreenAnimator() OVERRIDE; |
aura::Window* root_window_; |
- aura::Window* background_window_; |
- scoped_ptr<BackgroundController> background_controller_; |
scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; |
scoped_ptr<AcceleratorHandler> accelerator_handler_; |
scoped_ptr< ::wm::ScopedCaptureClient> capture_client_; |
@@ -234,13 +230,6 @@ ScreenManagerImpl::~ScreenManagerImpl() { |
void ScreenManagerImpl::Init() { |
// TODO(oshima): Move the background out from ScreenManager. |
root_window_->SetLayoutManager(new FillLayoutManager(root_window_)); |
- background_window_ = |
- CreateContainer(ContainerParams("AthenaBackground", CP_BACKGROUND)); |
- |
- background_window_->SetLayoutManager( |
- new FillLayoutManager(background_window_)); |
- background_controller_.reset(new BackgroundController(background_window_)); |
- |
capture_client_.reset(new ::wm::ScopedCaptureClient(root_window_)); |
accelerator_handler_.reset(new ScreenAcceleratorHandler(root_window_)); |
} |
@@ -324,10 +313,6 @@ aura::Window* ScreenManagerImpl::CreateContainer( |
return container; |
} |
-void ScreenManagerImpl::SetBackgroundImage(const gfx::ImageSkia& image) { |
- background_controller_->SetImage(image); |
-} |
- |
void ScreenManagerImpl::SetRotation(gfx::Display::Rotation rotation) { |
if (rotation == |
gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().rotation()) { |