Shrink the search box if the width is too small.

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 "base/bind.h"
 #include "base/strings/string_util.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ skipping 22 matching lines @@
 const int kIconMargin = 25;
 
 const int kTopMargin = 100;
 
 // Copied from ui/app_list/views/start_page_view.cc
 const int kInstantContainerSpacing = 20;
 const int kWebViewWidth = 500;
 const int kWebViewHeight = 105;
 const int kSearchBoxBorderWidth = 1;
 const int kSearchBoxCornerRadius = 2;
-const int kSearchBoxWidth = 490;
+
+// The search box spans horizontally over the 6 icons (3 apps icon and 3 control
+// icons) with margins.

[oshima, 2014/08/29 17:47:18]

can you update the comment as discussed offline?

[Jun Mukai, 2014/08/29 18:36:29]

Done.

+const int kSearchBoxWidth = kIconSize * 6 + kIconMargin * 7;
 const int kSearchBoxHeight = 40;
 
 class PlaceHolderButton : public views::ImageButton,
                           public views::ButtonListener {
  public:
   PlaceHolderButton()
       : ImageButton(this) {
     gfx::Canvas canvas(gfx::Size(kIconSize, kIconSize), 1.0f, true);
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
@@ skipping 196 matching lines @@
     int width) {
   LayoutData state;
   state.icons.set_size(app_icon_container_->size());
   state.icons.set_x(kIconMargin);
   state.icons.set_y(kIconMargin);
 
   state.controls.set_size(control_icon_container_->size());
   state.controls.set_x(width - kIconMargin - state.controls.width());
   state.controls.set_y(kIconMargin);
 
-  state.search_box.set_size(search_box_container_->size());
+  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.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_->size());
+  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());
@@ skipping 111 matching lines @@
   base::TrimWhitespace(
       delegate_->GetModel()->search_box()->text(), base::TRIM_ALL, &query);
 
   if (!query.empty())
     search_results_view_->SetSelectedIndex(0);
 
   LayoutSearchResults(!query.empty());
 }
 
 }  // namespace athena