Fix status bubble positioning with custom border widths by positioning the bu...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2008 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 "base/command_line.h"
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #include "base/file_version_info.h"
 #include "base/time.h"
@@ skipping 43 matching lines @@
 // static
 SkBitmap BrowserView::default_favicon_;
 SkBitmap BrowserView::otr_avatar_;
 // The vertical overlap between the TabStrip and the Toolbar.
 static const int kToolbarTabStripVerticalOverlap = 3;
 // The visible height of the shadow above the tabs. Clicks in this area are
 // treated as clicks to the frame, rather than clicks to the tab.
 static const int kTabShadowSize = 2;
 // The height of the status bubble.
 static const int kStatusBubbleHeight = 20;
-// The distance of the status bubble from the left edge of the window.
-static const int kStatusBubbleHorizontalOffset = 3;
-// The distance of the status bubble from the bottom edge of the window.
-static const int kStatusBubbleVerticalOffset = 2;
+// The overlap of the status bubble with the left edge of the window.
+static const int kStatusBubbleHorizontalOverlap = 2;
+// The overlap of the status bubble with the bottom edge of the window.
+static const int kStatusBubbleVerticalOverlap = 2;
 // An offset distance between certain toolbars and the toolbar that preceded
 // them in layout.
 static const int kSeparationLineHeight = 1;
 // The name of a key to store on the window handle so that other code can
 // locate this object using just the handle.
 static const wchar_t* kBrowserWindowKey = L"__BROWSER_WINDOW__";
 // The distance between tiled windows.
 static const int kWindowTilePixels = 10;
 // How frequently we check for hung plugin windows.
 static const int kDefaultHungPluginDetectFrequency = 2000;
@@ skipping 93 matching lines @@
   if (GetLocationBarView())
     GetLocationBarView()->location_entry()->ClosePopup();
 }
 
 gfx::Rect BrowserView::GetToolbarBounds() const {
   return toolbar_->bounds();
 }
 
 gfx::Rect BrowserView::GetClientAreaBounds() const {
   gfx::Rect container_bounds = contents_container_->bounds();
-  container_bounds.Offset(x(), y());
+  gfx::Point container_origin = container_bounds.origin();
+  ConvertPointToView(this, GetParent(), &container_origin);
+  container_bounds.set_origin(container_origin);
   return container_bounds;
 }
 
 int BrowserView::GetTabStripHeight() const {
   return tabstrip_->GetPreferredHeight();
 }
 
 bool BrowserView::IsToolbarVisible() const {
   return SupportsWindowFeature(FEATURE_TOOLBAR) ||
          SupportsWindowFeature(FEATURE_LOCATIONBAR);
@@ skipping 928 matching lines @@
     gfx::Size ps = active_download_shelf_->GetPreferredSize();
     active_download_shelf_->SetBounds(0, bottom - ps.height(), width(),
                                       ps.height());
     active_download_shelf_->Layout();
     bottom -= ps.height();
   }
   return bottom;
 }
 
 void BrowserView::LayoutStatusBubble(int top) {
-  int status_bubble_y =
-      top - kStatusBubbleHeight + kStatusBubbleVerticalOffset + y();
-  status_bubble_->SetBounds(kStatusBubbleHorizontalOffset, status_bubble_y,
-                            width() / 3, kStatusBubbleHeight);
+  gfx::Point origin(-kStatusBubbleHorizontalOverlap,
+                    top - kStatusBubbleHeight + kStatusBubbleVerticalOverlap);
+  ConvertPointToView(this, GetParent(), &origin);
+  status_bubble_->SetBounds(origin.x(), origin.y(), width() / 3,
+                            kStatusBubbleHeight);
 }
 
 bool BrowserView::MaybeShowBookmarkBar(TabContents* contents) {
   views::View* new_bookmark_bar_view = NULL;
   if (SupportsWindowFeature(FEATURE_BOOKMARKBAR) && contents) {
     new_bookmark_bar_view = GetBookmarkBarView();
     if (!show_bookmark_bar_pref_.GetValue() &&
         new_bookmark_bar_view->GetPreferredSize().height() == 0) {
       new_bookmark_bar_view = NULL;
     }
@@ skipping 209 matching lines @@
 
 // static
 void BrowserView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     initialized = true;
   }
 }