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"
@@ skipping 14 matching lines @@
       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.
 }
 
 void LocationBarContainer::AnimateTo(const gfx::Rect& bounds) {
   // Animation duration can change during session.
   animator_.SetAnimationDuration(GetAnimationDuration());
   animator_.AnimateViewTo(this, bounds);
 }
 
 bool LocationBarContainer::IsAnimating() const {
   return animator_.IsAnimating();
 }
 
 gfx::Rect LocationBarContainer::GetTargetBounds() {
   return animator_.GetTargetBounds(this);
 }
 
+void LocationBarContainer::SetBoundsForContainerAndView(

[sky, 2012/09/12 21:07:31]

Why doesn't SetBounds do what you want here?

[kuan, 2012/09/12 21:33:04]

u're right, i don't need to SetBounds for location_bar_view_.  however, i still
need to provide this method to store the size of location_bar_view so that i can
ue it in Layout.

+    const gfx::Rect& location_bar_container_bounds,
+    const gfx::Size& location_bar_view_size) {
+  SetBoundsRect(location_bar_container_bounds);
+  DCHECK(location_bar_view_);
+  location_bar_view_->SetBounds(0, 0, location_bar_view_size.width(),
+                                location_bar_view_size.height());
+  location_bar_view_size_ = location_bar_view_size;
+}
+
 std::string LocationBarContainer::GetClassName() const {
   return "browser/ui/views/location_bar/LocationBarContainer";
 }
 
 gfx::Size LocationBarContainer::GetPreferredSize() {
   return location_bar_view_->GetPreferredSize();
 }
 
+void LocationBarContainer::Layout() {
+  // If we're animating, |location_bar_view_| fully fills out the entire
+  // container's target bounds.  Otherwise, its bounds is what was last set via
+  // |SetBoundsForContainerAndView|.
+  if (IsAnimating()) {
+    gfx::Rect target_bounds = GetTargetBounds();
+    location_bar_view_->SetBounds(0, 0, target_bounds.width(),
+                                  target_bounds.height());
+  } else {
+    location_bar_view_->SetBounds(0, 0, location_bar_view_size_.width(),
+                                  location_bar_view_size_.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();
 }