A couple of tweaks to the AeroGlassNonClientView:

- fix broken window resizing using the sizing borders... || should have been an &&, resulted in all non-client areas being treated as window caption.
- use the width of the client view to size the tabstrip rather than the width of the non-client view. this was causing the new tab button to be clipped.

B=2218,2267
Review URL: http://codereview.chromium.org/2841

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2205 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/chrome/browser/views/frame/aero_glass_non_client_view.cc b/chrome/browser/views/frame/aero_glass_non_client_view.cc
index fd53ad8..5692a77 100644
--- a/chrome/browser/views/frame/aero_glass_non_client_view.cc
+++ b/chrome/browser/views/frame/aero_glass_non_client_view.cc
@@ -135,7 +135,7 @@ AeroGlassNonClientView::~AeroGlassNonClientView() {
 gfx::Rect AeroGlassNonClientView::GetBoundsForTabStrip(TabStrip* tabstrip) {
   // If we are maximized, the tab strip will be in line with the window
   // controls, so we need to make sure they don't overlap.
-  int tabstrip_width = GetWidth();
+  int tabstrip_width = browser_view_->GetWidth();
   if(frame_->IsMaximized()) {
     TITLEBARINFOEX titlebar_info;
     titlebar_info.cbSize = sizeof(TITLEBARINFOEX);
@@ -199,7 +199,7 @@ int AeroGlassNonClientView::NonClientHitTest(const gfx::Point& point) {
     // caption area above the tabs and the top sizing border.
     int client_view_right =
         frame_->client_view()->GetX() + frame_->client_view()->GetWidth();
-    if (point.x() >= frame_->client_view()->GetX() ||
+    if (point.x() >= frame_->client_view()->GetX() &&
         point.x() < client_view_right) {
       if (point.y() < kWindowSizingBorderSize)
         return HTTOP;