Fills athena background always.

athena/system/background_controller.cc

 // Copyright 2014 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.
 
 #include "athena/system/background_controller.h"
 
 #include "athena/system/public/system_ui.h"
+#include "athena/util/fill_layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace athena {
 
 class BackgroundView : public views::View {
@@ skipping 33 matching lines @@
   gfx::ImageSkia image_;
   views::View* system_info_view_;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundView);
 };
 
 BackgroundController::BackgroundController(aura::Window* background_container) {
   views::Widget* background_widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  params.parent = background_container;
   background_widget->Init(params);
+  background_widget->GetNativeWindow()->SetProperty(kAlwaysFillWindowKey, true);
   background_widget->GetNativeWindow()->layer()->SetMasksToBounds(true);
+  // background_widget should be reparented to |background_container| after
+  // settings kAlwaysFillWindowKey, otherwise FillLayoutManager cannot fill it
+  // properly.
+  views::Widget::ReparentNativeView(background_widget->GetNativeWindow(),
+                                    background_container);
   background_view_ = new BackgroundView;
   background_widget->SetContentsView(background_view_);
   background_widget->GetNativeView()->SetName("BackgroundWidget");
   background_widget->Show();
 }
 
 BackgroundController::~BackgroundController() {
   // background_widget is owned by the container and will be deleted
   // when the container is deleted.
 }
 
 void BackgroundController::SetImage(const gfx::ImageSkia& image) {
   // TODO(oshima): implement cross fede animation.
   background_view_->SetImage(image);
 }
 
 }  // namespace athena