Fixes a couple of bugs encountered in getting info bubbles to work:...

chrome/browser/views/info_bubble.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 "chrome/browser/views/info_bubble.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/path.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/views/frame/browser_view.h"
+#include "chrome/browser/window_sizer.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "grit/theme_resources.h"
 #include "views/widget/root_view.h"
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
-#include "app/win_util.h"
 #include "base/win_util.h"
 #endif
 
 using views::View;
 
 // All sizes are in pixels.
 
 // Size of the border, along each edge.
 static const int kBorderSize = 1;
 
@@ skipping 46 matching lines @@
                              views::View* content,
                              InfoBubbleDelegate* delegate) {
   InfoBubble* window = new InfoBubble();
   window->Init(parent, position_relative_to, content);
   // Set the delegate before we show, on the off chance the delegate is needed
   // during showing.
   window->delegate_ = delegate;
 #if defined(OS_WIN)
   window->ShowWindow(SW_SHOW);
 #else
-  NOTREACHED();
+  static_cast<WidgetGtk*>(window)->Show();
 #endif
   return window;
 }
 
 InfoBubble::InfoBubble()
     :
 #if defined(OS_LINUX)
       WidgetGtk(TYPE_POPUP),
 #endif
       delegate_(NULL),
@@ skipping 30 matching lines @@
   set_initial_class_style(
       (win_util::GetWinVersion() < win_util::WINVERSION_XP) ?
       0 : CS_DROPSHADOW);
 #endif
   content_view_ = CreateContentView(content);
   gfx::Rect bounds =
       content_view_->CalculateWindowBoundsAndAjust(position_relative_to);
 
 #if defined(OS_WIN)
   WidgetWin::Init(parent->GetNativeWindow(), bounds, true);
+#else
+  WidgetGtk::Init(GTK_WIDGET(parent->GetNativeWindow()), bounds, true);
 #endif
   SetContentsView(content_view_);
   // The preferred size may differ when parented. Ask for the bounds again
   // and if they differ reset the bounds.
   gfx::Rect parented_bounds =
       content_view_->CalculateWindowBoundsAndAjust(position_relative_to);
 
   if (bounds != parented_bounds) {
 #if defined(OS_WIN)
     SetWindowPos(NULL, parented_bounds.x(), parented_bounds.y(),
                  parented_bounds.width(), parented_bounds.height(),
                  SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOZORDER);
     // Invoke ChangeSize, otherwise layered window isn't updated correctly.
     ChangeSize(0, CSize(parented_bounds.width(), parented_bounds.height()));
-#else
-    NOTIMPLEMENTED();
 #endif
   }
 
 #if defined(OS_WIN)
   // Register the Escape accelerator for closing.
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(GetNativeView());
   focus_manager->RegisterAccelerator(views::Accelerator(VK_ESCAPE, false,
                                                         false, false),
                                      this);
@@ skipping 84 matching lines @@
   if (UILayoutIsRightToLeft()) {
     arrow_edge_ = TOP_RIGHT;
   } else {
     arrow_edge_ = TOP_LEFT;
   }
   AddChildView(content);
 }
 
 gfx::Rect InfoBubble::ContentView::CalculateWindowBoundsAndAjust(
     const gfx::Rect& position_relative_to) {
-#if defined(OS_WIN)
-  gfx::Rect monitor_bounds = win_util::GetMonitorBoundsForRect(
-      position_relative_to);
-#else
-  gfx::Rect monitor_bounds;
-#endif
+  scoped_ptr<WindowSizer::MonitorInfoProvider> monitor_provider(
+      WindowSizer::CreateDefaultMonitorInfoProvider());
+  gfx::Rect monitor_bounds(
+      monitor_provider->GetMonitorWorkAreaMatching(position_relative_to));
   // Calculate the bounds using TOP_LEFT (the default).
   gfx::Rect window_bounds = CalculateWindowBounds(position_relative_to);
   if (monitor_bounds.IsEmpty() || monitor_bounds.Contains(window_bounds))
     return window_bounds;
   // Didn't fit, adjust the edge to fit as much as we can.
   if (window_bounds.bottom() > monitor_bounds.bottom())
     SetArrowEdge(BOTTOM_LEFT);
   if (window_bounds.right() > monitor_bounds.right()) {
     if (IsTop())
       SetArrowEdge(TOP_RIGHT);
@@ skipping 178 matching lines @@
     x -= kArrowXOffset;
   else
     x = x + kArrowXOffset - pref.width();
   if (IsTop()) {
     y = position_relative_to.bottom() + kArrowToContentPadding;
   } else {
     y = position_relative_to.y() - kArrowToContentPadding - pref.height();
   }
   return gfx::Rect(x, y, pref.width(), pref.height());
 }