alternate ntp: clip middle omnibox when resizing browser window

chrome/browser/ui/views/toolbar_view.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/toolbar_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
@@ skipping 405 matching lines @@
 
   gfx::Rect location_container_bounds =
       browser_view->search_view_controller()->GetNTPOmniboxBounds(
           location_bar_container_->parent());
   if (location_container_bounds.width() == 0)
     return;
 
   location_bar_container_->SetInToolbar(false);
   location_container_bounds.set_height(
       location_bar_container_->GetPreferredSize().height());
-  location_bar_container_->SetBoundsRect(location_container_bounds);
+
+  // If bounds of |location_bar_container_| is not contained within its
+  // parent's, adjust the former's to within the latter's.  This will clip its
+  // child |location_bar_view_| within its bounds without resizing it.
+  // Note that parent of |location_bar_container_| i.e. BrowserView can't clip
+  // its children, else it loses the 3D shadows.
+  gfx::Rect parent_rect = location_bar_container_->parent()->GetLocalBounds();
+  gfx::Rect intersect_rect = parent_rect.Intersect(location_container_bounds);
+  // If the two bounds don't intersect, set bounds of |location_bar_container_|
+  // to 0.
+  location_bar_container_->SetBoundsRect(
+      intersect_rect.IsEmpty() ? gfx::Rect() : intersect_rect);

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

Why do you need the empty test? If empty, then isn't intersect_rect the same as
gfx::Rect?

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

Done.  i thot Rect::Intersect may return negative values for x and y if its
width or height is 0, but i was wrong.

 #endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, AccessiblePaneView overrides:
 
 bool ToolbarView::SetPaneFocus(views::View* initial_focus) {
   if (!AccessiblePaneView::SetPaneFocus(initial_focus))
     return false;
 
@@ skipping 534 matching lines @@
 }
 
 void ToolbarView::SetLocationBarContainerBounds(
     const gfx::Rect& bounds) {
   if (location_bar_container_->IsAnimating())
     return;
 
   // LocationBarContainer is not a child of the ToolbarView.
   gfx::Point origin(bounds.origin());
   views::View::ConvertPointToTarget(this, location_bar_container_->parent(),
-                                  &origin);
+                                    &origin);
   gfx::Rect target_bounds(origin, bounds.size());
   if (location_bar_container_->GetTargetBounds() != target_bounds) {
     location_bar_container_->SetInToolbar(true);
     location_bar_container_->SetBoundsRect(target_bounds);
   }
 }