Re-land:

views/controls/tabbed_pane/native_tabbed_pane_gtk.h

 // Copyright (c) 2011 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.
 
 #ifndef VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_GTK_H_
 #define VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_GTK_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 31 matching lines @@
 
   // View:
   virtual FocusTraversable* GetFocusTraversable() OVERRIDE;
 
  private:
   void DoAddTabAtIndex(int index,
                        const std::wstring& title,
                        View* contents,
                        bool select_if_first_tab);
 
-  // Returns the WidgetGtk containing the tab contents at |index|.
-  WidgetGtk* GetWidgetAt(int index);
+  // Returns the Widget containing the tab contents at |index|.
+  Widget* GetWidgetAt(int index);
 
   View* GetTabViewAt(int index);
   void OnSwitchPage(int selected_tab_index);
 
   static void CallSwitchPage(GtkNotebook* widget,
                              GtkNotebookPage* page,
                              guint selected_tab_index,
                              NativeTabbedPaneGtk* tabbed_pane);
 
   // The tabbed-pane we are bound to.
   TabbedPane* tabbed_pane_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTabbedPaneGtk);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TABBED_PANE_NATIVE_TABBED_PANE_GTK_H_