Remove WebContents methods that duplicate WebContentsView methods.

chrome/browser/instant/instant_controller.cc

 // Copyright 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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.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 "net/base/escape.h"
 #include "third_party/icu/public/common/unicode/normalizer2.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/widget/widget.h"
 #endif
 
 namespace {
 
 // An artificial delay (in milliseconds) we introduce before telling the Instant
@@ skipping 90 matching lines @@
   return view_gaining_focus;
 }
 
 // Returns true if |view| is the top-level contents view or a child view in the
 // view hierarchy of |contents|.
 bool IsViewInContents(gfx::NativeView view, content::WebContents* contents) {
   content::RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView();
   if (!view || !rwhv)
     return false;
 
-  gfx::NativeView tab_view = contents->GetNativeView();
+  gfx::NativeView tab_view = contents->GetView()->GetNativeView();
   if (view == rwhv->GetNativeView() || view == tab_view)
     return true;
 
   // Walk up the view hierarchy to determine if the view is a subview of the
   // WebContents view (such as a windowed plugin or http auth dialog).
   while (view) {
     view = platform_util::GetParent(view);
     if (view == tab_view)
       return true;
   }
@@ skipping 420 matching lines @@
       instant_tab_ != NULL));
 
   // If we are on an already committed search results page, send a submit event
   // to the page, but otherwise, nothing else to do.
   if (instant_tab_) {
     if (type == INSTANT_COMMIT_PRESSED_ENTER &&
         (last_match_was_search_ ||
          last_suggestion_.behavior == INSTANT_COMPLETE_NEVER)) {
       EnsureSearchTermsAreSet(instant_tab_->contents(), last_omnibox_text_);
       instant_tab_->Submit(last_omnibox_text_);
-      instant_tab_->contents()->Focus();
+      instant_tab_->contents()->GetView()->Focus();
       return true;
     }
     return false;
   }
 
   if (!IsPreviewingSearchResults() && type != INSTANT_COMMIT_NAVIGATED)
     return false;
 
   // There may re-entrance here, from the call to browser_->CommitInstant below,
   // which can cause a TabDeactivated notification which gets back here.
@@ skipping 499 matching lines @@
   browser_->FocusOmniboxInvisibly();
 }
 
 void InstantController::StopCapturingKeyStrokes(
     content::WebContents* contents) {
   // Nothing to do if omnibox doesn't have invisible focus.
   if (!extended_enabled_ || omnibox_focus_state_ != OMNIBOX_FOCUS_INVISIBLE)
     return;
 
   DCHECK(IsContentsFrom(instant_tab(), contents));
-  contents->Focus();
+  contents->GetView()->Focus();
 }
 
 void InstantController::NavigateToURL(const content::WebContents* contents,
                                       const GURL& url,
                                       content::PageTransition transition) {
   // TODO(samarth): handle case where contents are no longer "active" (e.g. user
   // has switched tabs).
   if (!extended_enabled_)
     return;
   if (overlay_)
@@ skipping 388 matching lines @@
     overlay_->SendMostVisitedItems(items);
   if (ntp_)
     ntp_->SendMostVisitedItems(items);
   if (instant_tab_)
     instant_tab_->SendMostVisitedItems(items);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_INSTANT_SENT_MOST_VISITED_ITEMS,
       content::Source<InstantController>(this),
       content::NotificationService::NoDetails());
 }