Remove WebContents methods that duplicate WebContentsView methods.

ui/views/controls/webview/webview.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 "ui/views/controls/webview/webview.h"
 
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
 #include "ipc/ipc_message.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/views_delegate.h"
 
 namespace views {
 
@@ skipping 88 matching lines @@
 }
 
 bool WebView::IsFocusable() const {
   // We need to be focusable when our contents is not a view hierarchy, as
   // clicking on the contents needs to focus us.
   return !!web_contents_;
 }
 
 void WebView::OnFocus() {
   if (web_contents_)
-    web_contents_->Focus();
+    web_contents_->GetView()->Focus();
 }
 
 void WebView::AboutToRequestFocusFromTabTraversal(bool reverse) {
   if (web_contents_)
     web_contents_->FocusThroughTabTraversal(reverse);
 }
 
 void WebView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_GROUPING;
 }
@@ skipping 45 matching lines @@
   OnWebContentsFocused(web_contents_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebView, private:
 
 void WebView::AttachWebContents() {
   // Prevents attachment if the WebView isn't already in a Widget, or it's
   // already attached.
   if (!GetWidget() || !web_contents_ ||
-      wcv_holder_->native_view() == web_contents_->GetNativeView()) {
+      wcv_holder_->native_view() == web_contents_->GetView()->GetNativeView()) {
     return;
   }
 
   if (web_contents_) {
-    wcv_holder_->Attach(web_contents_->GetNativeView());
+    wcv_holder_->Attach(web_contents_->GetView()->GetNativeView());
 
     // The WebContentsView will not be focused automatically when it is
     // attached, so we need to pass on focus to it if the FocusManager thinks
     // the WebView is focused. Note that not every Widget has a focus manager.
     FocusManager* focus_manager = GetFocusManager();
     if (focus_manager && focus_manager->GetFocusedView() == this)
-      web_contents_->Focus();
+      web_contents_->GetView()->Focus();
 
     registrar_.Add(
         this,
         content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
         content::Source<content::NavigationController>(
             &web_contents_->GetController()));
     registrar_.Add(
         this,
         content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
         content::Source<content::WebContents>(web_contents_));
   }
 }
 
 void WebView::DetachWebContents() {
   if (web_contents_) {
     wcv_holder_->Detach();
 #if defined(OS_WIN) && !defined(USE_AURA)
     // TODO(beng): This should either not be necessary, or be done implicitly by
     // NativeViewHostWin on Detach(). As it stands, this is needed so that the
     // view of the detached contents knows to tell the renderer it's been
     // hidden.
     //
     // Moving this out of here would also mean we wouldn't be potentially
     // calling member functions on a half-destroyed WebContents.
-    ShowWindow(web_contents_->GetNativeView(), SW_HIDE);
+    ShowWindow(web_contents_->GetView()->GetNativeView(), SW_HIDE);
 #endif
   }
   registrar_.RemoveAll();
 }
 
 void WebView::RenderViewHostChanged(content::RenderViewHost* old_host,
                                     content::RenderViewHost* new_host) {
   if (GetFocusManager()->GetFocusedView() == this)
-    web_contents_->Focus();
+    web_contents_->GetView()->Focus();
 }
 
 void WebView::WebContentsDestroyed(content::WebContents* web_contents) {
   DCHECK(web_contents == web_contents_);
   SetWebContents(NULL);
 }
 
 content::WebContents* WebView::CreateWebContents(
       content::BrowserContext* browser_context,
       content::SiteInstance* site_instance) {
   content::WebContents* contents = NULL;
   if (ViewsDelegate::views_delegate) {
     contents = ViewsDelegate::views_delegate->CreateWebContents(
         browser_context, site_instance);
   }
 
   if (!contents) {
     content::WebContents::CreateParams create_params(
         browser_context, site_instance);
     return content::WebContents::Create(create_params);
   }
 
   return contents;
 }
 
 }  // namespace views