Moves home card background to HomeCardView.

athena/home/athena_start_page_view.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/home/athena_start_page_view.h"
 
 #include "athena/home/home_card_constants.h"
 #include "athena/system/public/system_ui.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
@@ skipping 145 matching lines @@
 };
 
 }  // namespace
 
 namespace athena {
 
 // static
 const char AthenaStartPageView::kViewClassName[] = "AthenaStartPageView";
 
 AthenaStartPageView::LayoutData::LayoutData()
-    : system_info_opacity(1.0f),
-      logo_opacity(1.0f),
-      background_opacity(1.0f) {
+    : system_info_opacity(1.0f), logo_opacity(1.0f) {
 }
 
 AthenaStartPageView::AthenaStartPageView(
     app_list::AppListViewDelegate* view_delegate)
     : delegate_(view_delegate),
       layout_state_(0.0f),
       weak_factory_(this) {
-  background_ = new views::View();
-  // Vertical gradient background for the time being.
-  // TODO(mukai): replace by the actual one.
-  background_->set_background(
-      views::Background::CreateVerticalGradientBackground(SK_ColorLTGRAY,
-                                                          SK_ColorWHITE));
-  background_->SetPaintToLayer(true);
-  background_->SetFillsBoundsOpaquely(false);
-  AddChildView(background_);
-
   system_info_view_ =
       SystemUI::Get()->CreateSystemInfoView(SystemUI::COLOR_SCHEME_DARK);
   system_info_view_->SetPaintToLayer(true);
   system_info_view_->SetFillsBoundsOpaquely(false);
   AddChildView(system_info_view_);
 
   logo_ = view_delegate->CreateStartPageWebView(
       gfx::Size(kWebViewWidth, kWebViewHeight));
   logo_->SetPaintToLayer(true);
   logo_->SetFillsBoundsOpaquely(false);
@@ skipping 100 matching lines @@
 
   int search_box_max_width =
       state.controls.x() - state.icons.right() - kIconMargin * 2;
   state.search_box.set_width(std::min(search_box_max_width, kSearchBoxWidth));
   state.search_box.set_height(search_box_container_->height());
   state.search_box.set_x((width - state.search_box.width()) / 2);
   state.search_box.set_y((kHomeCardHeight - state.search_box.height()) / 2);
 
   state.system_info_opacity = 0.0f;
   state.logo_opacity = 0.0f;
-  state.background_opacity = 0.9f;
   return state;
 }
 
 AthenaStartPageView::LayoutData AthenaStartPageView::CreateCenteredBounds(
     int width) {
   LayoutData state;
 
   state.search_box.set_size(search_box_container_->GetPreferredSize());
   state.search_box.set_x((width - state.search_box.width()) / 2);
   state.search_box.set_y(logo_->bounds().bottom() + kInstantContainerSpacing);
 
   state.icons.set_size(app_icon_container_->size());
   state.icons.set_x(width / 2 - state.icons.width() - kIconMargin / 2);
   state.icons.set_y(state.search_box.bottom() + kInstantContainerSpacing);
 
   state.controls.set_size(control_icon_container_->size());
   state.controls.set_x(width / 2 + kIconMargin / 2 + kIconMargin % 2);
   state.controls.set_y(state.icons.y());
 
   state.system_info_opacity = 1.0f;
   state.logo_opacity = 1.0f;
-  state.background_opacity = 1.0f;
   return state;
 }
 
 void AthenaStartPageView::UpdateAppIcons() {
   app_list::AppListItemList* top_level =
       delegate_->GetModel()->top_level_item_list();
   size_t max_items = std::min(top_level->item_count(), kMaxIconNum);
   for (size_t i = 0; i < max_items; ++i) {
     if (i < static_cast<size_t>(app_icon_container_->child_count())) {
       AppIconButton* button =
@@ skipping 100 matching lines @@
       gfx::Tween::CalculateValue(gfx::Tween::EASE_IN_2, layout_state_),
       bottom_bounds.logo_opacity, centered_bounds.logo_opacity));
   logo_->SetVisible(logo_->layer()->GetTargetOpacity() != 0.0f);
 
   app_icon_container_->SetBoundsRect(gfx::Tween::RectValueBetween(
       layout_state_, bottom_bounds.icons, centered_bounds.icons));
   control_icon_container_->SetBoundsRect(gfx::Tween::RectValueBetween(
       layout_state_, bottom_bounds.controls, centered_bounds.controls));
   search_box_container_->SetBoundsRect(gfx::Tween::RectValueBetween(
       layout_state_, bottom_bounds.search_box, centered_bounds.search_box));
-
-  background_->SetBoundsRect(bounds());
-  background_->layer()->SetOpacity(gfx::Tween::FloatValueBetween(
-      layout_state_,
-      bottom_bounds.background_opacity,
-      centered_bounds.background_opacity));
 }
 
 bool AthenaStartPageView::OnKeyPressed(const ui::KeyEvent& key_event) {
   return search_results_view_->visible() &&
       search_results_view_->OnKeyPressed(key_event);
 }
 
 void AthenaStartPageView::QueryChanged(app_list::SearchBoxView* sender) {
   delegate_->StartSearch();
 
@@ skipping 22 matching lines @@
                                           app_list::AppListItem* item) {
   UpdateAppIcons();
 }
 
 // static
 size_t AthenaStartPageView::GetMaxIconNumForTest() {
   return kMaxIconNum;
 }
 
 }  // namespace athena