Remove WebContents methods that duplicate WebContentsView methods.

chrome/browser/ui/gtk/gtk_window_util.cc

 // Copyright (c) 2012 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_window_util.h"
 
 #include <dlfcn.h>
 #include "chrome/browser/ui/base_window.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
 
 using content::RenderWidgetHost;
 using content::WebContents;
 
 namespace gtk_window_util {
 
 // Keep track of the last click time and the last click position so we can
 // filter out extra GDK_BUTTON_PRESS events when a double click happens.
 static guint32 last_click_time;
 static int last_click_x;
 static int last_click_y;
 
 // Performs Cut/Copy/Paste operation on the |window|.
 // If the current render view is focused, then just call the specified |method|
 // 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(GtkWindow* window,
                     WebContents* web_contents,
                     void (RenderWidgetHost::*method)(),
                     const char* signal) {
   GtkWidget* widget = gtk_window_get_focus(window);
   if (widget == NULL)
     return;  // Do nothing if no focused widget.
 
-  if (web_contents && widget == web_contents->GetContentNativeView()) {
+  if (web_contents &&
+      widget == web_contents->GetView()->GetContentNativeView()) {
     (web_contents->GetRenderViewHost()->*method)();
   } else {
     guint id;
     if ((id = g_signal_lookup(signal, G_OBJECT_TYPE(widget))) != 0)
       g_signal_emit(widget, id, 0);
   }
 }
 
 void DoCut(GtkWindow* window, WebContents* web_contents) {
   DoCutCopyPaste(window, web_contents,
@@ skipping 199 matching lines @@
                           gfx::Rect* bounds,
                           gfx::Rect* restored_bounds) {
   gint x, y;
   gtk_window_get_position(window->GetNativeWindow(), &x, &y);
   (*bounds).set_origin(gfx::Point(x, y));
   if (!window->IsFullscreen() && !window->IsMaximized())
     *restored_bounds = *bounds;
 }
 
 }  // namespace gtk_window_util