Re-land:

views/widget/tooltip_manager_gtk.cc

 // Copyright (c) 2010 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 "views/widget/tooltip_manager_gtk.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/font.h"
 #include "views/focus/focus_manager.h"
@@ skipping 67 matching lines @@
 }
 
 bool TooltipManagerGtk::ShowTooltip(int x, int y, bool for_keyboard,
                                     GtkTooltip* tooltip) {
   View* view = NULL;
   gfx::Point view_loc;
   if (keyboard_view_) {
     view = keyboard_view_;
     view_loc.SetPoint(view->width() / 2, view->height() / 2);
   } else if (!for_keyboard) {
-    RootView* root_view = widget_->GetRootView();
+    RootView* root_view = widget_->GetWidget()->GetRootView();
     view = root_view->GetEventHandlerForPoint(gfx::Point(x, y));
     view_loc.SetPoint(x, y);
     View::ConvertPointFromWidget(view, &view_loc);
   } else {
-    FocusManager* focus_manager = widget_->GetFocusManager();
+    FocusManager* focus_manager = widget_->GetWidget()->GetFocusManager();
     if (focus_manager) {
       view = focus_manager->GetFocusedView();
       if (view)
         view_loc.SetPoint(view->width() / 2, view->height() / 2);
     }
   }
 
   if (!view)
     return false;
 
   std::wstring text;
   if (!view->GetTooltipText(view_loc, &text))
     return false;
 
   // Sets the area of the tooltip. This way if different views in the same
   // widget have tooltips the tooltip doesn't get stuck at the same location.
   gfx::Rect vis_bounds = view->GetVisibleBounds();
   gfx::Point widget_loc(vis_bounds.origin());
   View::ConvertPointToWidget(view, &widget_loc);
   GdkRectangle tip_area = { widget_loc.x(), widget_loc.y(),
                             vis_bounds.width(), vis_bounds.height() };
   gtk_tooltip_set_tip_area(tooltip, &tip_area);
 
   int max_width, line_count;
   gfx::Point screen_loc(x, y);
-  View::ConvertPointToScreen(widget_->GetRootView(), &screen_loc);
+  View::ConvertPointToScreen(widget_->GetWidget()->GetRootView(), &screen_loc);
   TrimTooltipToFit(&text, &max_width, &line_count, screen_loc.x(),
                    screen_loc.y());
   tooltip_window_.SetTooltipText(text);
 
   return true;
 }
 
 void TooltipManagerGtk::UpdateTooltip() {
   // UpdateTooltip may be invoked after the widget has been destroyed.
   GtkWidget* widget = widget_->GetNativeView();
@@ skipping 43 matching lines @@
   if (!g_signal_parse_name("show_help", itype, &signal_id, &detail, FALSE)) {
     NOTREACHED();
     return false;
   }
   gboolean result;
   g_signal_emit(widget, signal_id, 0, GTK_WIDGET_HELP_TOOLTIP, &result);
   return true;
 }
 
 }  // namespace views