Introduce system_info as an independent container.

athena/home/home_card_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/home_card_view.h"
 
 #include "athena/home/home_card_constants.h"
+#include "athena/util/athena_constants.h"
 #include "athena/wm/public/window_manager.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/closure_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/background.h"
 #include "ui/views/focus/focus_manager.h"
@@ skipping 208 matching lines @@
       search_box_view_->GetHeightForWidth(main_bounds.width()));
   search_box_view_->SetBoundsRect(main_bounds);
 }
 
 gfx::Rect HomeCardView::GetDragIndicatorBounds(HomeCard::State state) {
   gfx::Rect drag_indicator_bounds(
       GetContentsBounds().CenterPoint().x() - kHomeCardDragIndicatorWidth / 2,
       kHomeCardDragIndicatorMarginHeight, kHomeCardDragIndicatorWidth,
       kHomeCardDragIndicatorHeight);
   if (state == HomeCard::VISIBLE_CENTERED)
     drag_indicator_bounds.Offset(0, kSystemUIHeight);

[oshima, 2014/11/12 20:35:02]

This is ok for now, but we probably should update the work area and this code
should use the workare instead of const.

   return drag_indicator_bounds;
 }
 
 gfx::Rect HomeCardView::GetMainViewBounds(HomeCard::State state) {
   const gfx::Rect contents_bounds = GetContentsBounds();
   const int main_width = main_view_->GetPreferredSize().width();
   gfx::Rect main_bounds(
       contents_bounds.CenterPoint().x() - main_width / 2,
       GetDragIndicatorBounds(state).bottom() + kIndicatorOffset, main_width,
       contents_bounds.height());
   // This is a bit hacky but slightly shifting up the main_view to fit
   // the search box and app icons in the home card.
   if (state != HomeCard::VISIBLE_CENTERED)
     main_bounds.set_y(kAppListOffset);
   return main_bounds;
 }
 
 void HomeCardView::UpdateMinimizedBackgroundVisibility() {
   minimized_background_->SetVisible(
       minimized_background_->layer()->GetTargetOpacity() != 0.0f);
 }
 
 views::View* HomeCardView::GetContentsView() {
   return this;
 }
 
 }  // namespace athena