Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

chrome/browser/ui/gtk/gtk_util.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/gtk_util.h"
 
 #include <cairo/cairo.h>
 
 #include <cstdarg>
 
@@ skipping 38 matching lines @@
 #include "chrome/browser/chromeos/frame/browser_view.h"
 #include "chrome/browser/chromeos/native_dialog_window.h"
 #else
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #endif
 
 // These conflict with base/tracked_objects.h, so need to come last.
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
+using content::WebContents;
+
 namespace {
 
 #if defined(GOOGLE_CHROME_BUILD)
 static const char* kIconName = "google-chrome";
 #else
 static const char* kIconName = "chromium-browser";
 #endif
 
 const char kBoldLabelMarkup[] = "<span weight='bold'>%s</span>";
 
@@ skipping 83 matching lines @@
                                    GTK_WIDGET(item->data),
                                    event);
   }
   g_list_free(children);
 
   return TRUE;
 }
 
 #if defined(OS_CHROMEOS)
 
-TabContents* GetBrowserWindowSelectedTabContents(BrowserWindow* window) {
+WebContents* GetBrowserWindowSelectedWebContents(BrowserWindow* window) {
   chromeos::BrowserView* browser_view = static_cast<chromeos::BrowserView*>(
       window);
-  return browser_view->GetSelectedTabContents();
+  return browser_view->GetSelectedWebContents();
 }
 
 GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) {
   gfx::NativeView widget = gtk_window_get_focus(window->GetNativeHandle());
 
   if (widget == NULL) {
     chromeos::BrowserView* browser_view = static_cast<chromeos::BrowserView*>(
         window);
     widget = browser_view->saved_focused_widget();
   }
 
   return widget;
 }
 
 #else
 
-TabContents* GetBrowserWindowSelectedTabContents(BrowserWindow* window) {
+WebContents* GetBrowserWindowSelectedWebContents(BrowserWindow* window) {
   BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>(
       window);
-  return browser_window->browser()->GetSelectedTabContents();
+  return browser_window->browser()->GetSelectedWebContents();
 }
 
 GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) {
   return gtk_window_get_focus(window->GetNativeHandle());
 }
 
 #endif
 
 }  // namespace
 
@@ skipping 969 matching lines @@
 // against the current render view host, otherwise emit the specified |signal|
 // against the focused widget.
 // TODO(suzhe): This approach does not work for plugins.
 void DoCutCopyPaste(BrowserWindow* window,
                     void (RenderViewHost::*method)(),
                     const char* signal) {
   GtkWidget* widget = GetBrowserWindowFocusedWidget(window);
   if (widget == NULL)
     return;  // Do nothing if no focused widget.
 
-  TabContents* current_tab = GetBrowserWindowSelectedTabContents(window);
+  WebContents* current_tab = GetBrowserWindowSelectedWebContents(window);
   if (current_tab && widget == current_tab->GetContentNativeView()) {
     (current_tab->GetRenderViewHost()->*method)();
   } else {
     guint id;
     if ((id = g_signal_lookup(signal, G_OBJECT_TYPE(widget))) != 0)
       g_signal_emit(widget, id, 0);
   }
 }
 
 void DoCut(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Cut, "cut-clipboard");
 }
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util