alternate ntp: clip middle omnibox when resizing browser window

chrome/browser/ui/views/location_bar/location_bar_container.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/location_bar/location_bar_container.h"
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/webui/instant_ui.h"
 #include "ui/base/events/event.h"
 #include "ui/views/background.h"
 #include "ui/views/layout/fill_layout.h"

[sky, 2012/09/13 19:58:24]

remove include

[kuan, 2012/09/13 20:13:28]

Done.

 
 namespace {
 
 // Duration of the animations used by this class (AnimateTo()).
 const int kAnimationDuration = 180;
 
 }
 
 LocationBarContainer::LocationBarContainer(views::View* parent,
                                            bool instant_extended_api_enabled)
     : animator_(parent),
       view_parent_(NULL),
       location_bar_view_(NULL),
       native_view_host_(NULL),
       in_toolbar_(true),
       instant_extended_api_enabled_(instant_extended_api_enabled) {
   parent->AddChildView(this);
   animator_.set_tween_type(ui::Tween::EASE_IN_OUT);
   PlatformInit();
   if (instant_extended_api_enabled) {
     view_parent_->set_background(
         views::Background::CreateSolidBackground(GetBackgroundColor()));
   }
-  SetLayoutManager(new views::FillLayout);
 }
 
 LocationBarContainer::~LocationBarContainer() {
 }
 
 void LocationBarContainer::SetLocationBarView(LocationBarView* view) {
   DCHECK(!location_bar_view_ && view);
   location_bar_view_ = view;
   view_parent_->AddChildView(location_bar_view_);
   DCHECK_EQ(1, view_parent_->child_count());  // Only support one child.
@@ skipping 14 matching lines @@
 }
 
 std::string LocationBarContainer::GetClassName() const {
   return "browser/ui/views/location_bar/LocationBarContainer";
 }
 
 gfx::Size LocationBarContainer::GetPreferredSize() {
   return location_bar_view_->GetPreferredSize();
 }
 
+void LocationBarContainer::Layout() {
+  // |location_bar_view_| fills the entire width of the container, but retains
+  // its preferred height, so that it's not resized which, if shrunk, will
+  // squish the placeholder text within a smaller vertical space.
+  location_bar_view_->SetBounds(0, 0, bounds().width(),
+      location_bar_view_->GetPreferredSize().height());
+}
+
 bool LocationBarContainer::SkipDefaultKeyEventProcessing(
     const ui::KeyEvent& event) {
   return location_bar_view_->SkipDefaultKeyEventProcessing(event);
 }
 
 void LocationBarContainer::GetAccessibleState(
     ui::AccessibleViewState* state) {
   location_bar_view_->GetAccessibleState(state);
 }
 
 void LocationBarContainer::OnBoundsAnimatorDone(
     views::BoundsAnimator* animator) {
   SetInToolbar(true);
 }
 
 // static
 int LocationBarContainer::GetAnimationDuration() {
   return kAnimationDuration * InstantUI::GetSlowAnimationScaleFactor();
 }