Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1037)

Unified Diff: athena/home/athena_start_page_view.cc

Issue 692643003: Moves home card background to HomeCardView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/home/athena_start_page_view.h ('k') | athena/home/home_card_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/home/athena_start_page_view.cc
diff --git a/athena/home/athena_start_page_view.cc b/athena/home/athena_start_page_view.cc
index 317d48fc44d5c4707be66a80750191364d40d8a1..bb78ec2bc857f6a8946c72e59f855b065f467eb8 100644
--- a/athena/home/athena_start_page_view.cc
+++ b/athena/home/athena_start_page_view.cc
@@ -163,9 +163,7 @@ namespace athena {
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(
@@ -173,16 +171,6 @@ AthenaStartPageView::AthenaStartPageView(
: 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);
@@ -303,7 +291,6 @@ AthenaStartPageView::LayoutData AthenaStartPageView::CreateBottomBounds(
state.system_info_opacity = 0.0f;
state.logo_opacity = 0.0f;
- state.background_opacity = 0.9f;
return state;
}
@@ -325,7 +312,6 @@ AthenaStartPageView::LayoutData AthenaStartPageView::CreateCenteredBounds(
state.system_info_opacity = 1.0f;
state.logo_opacity = 1.0f;
- state.background_opacity = 1.0f;
return state;
}
@@ -446,12 +432,6 @@ void AthenaStartPageView::Layout() {
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) {
« no previous file with comments | « athena/home/athena_start_page_view.h ('k') | athena/home/home_card_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698