Remove WebContents methods that duplicate WebContentsView methods.

chrome/browser/ui/views/hung_renderer_view.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/views/hung_renderer_view.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include <windows.h>
 #endif
 
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_vector.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/logging_chrome.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
 #include "content/public/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
@@ skipping 164 matching lines @@
 }
 
 // static
 HungRendererDialogView* HungRendererDialogView::GetInstance() {
   return g_instance_;
 }
 
 // static
 bool HungRendererDialogView::IsFrameActive(WebContents* contents) {
   gfx::NativeView frame_view =
-      platform_util::GetTopLevel(contents->GetNativeView());
+      platform_util::GetTopLevel(contents->GetView()->GetNativeView());
   return platform_util::IsWindowActive(frame_view);
 }
 
 #if !defined(OS_WIN)
 // static
 void HungRendererDialogView::KillRendererProcess(
     base::ProcessHandle process_handle) {
   base::KillProcess(process_handle, content::RESULT_CODE_HUNG, false);
 }
 #endif  // OS_WIN
@@ skipping 17 matching lines @@
   // window (but still invisible). If the user has another window or
   // application selected, activating ourselves is rude.
   if (!IsFrameActive(contents) &&
       !platform_util::IsWindowActive(GetWidget()->GetNativeWindow()))
     return;
 
   if (!GetWidget()->IsActive()) {
     gfx::Rect bounds = GetDisplayBounds(contents);
 
     gfx::NativeView frame_view =
-        platform_util::GetTopLevel(contents->GetNativeView());
+        platform_util::GetTopLevel(contents->GetView()->GetNativeView());
 
     views::Widget* insert_after =
         views::Widget::GetWidgetForNativeView(frame_view);
     GetWidget()->SetBoundsConstrained(bounds);
     if (insert_after)
       GetWidget()->StackAboveWidget(insert_after);
 
     // We only do this if the window isn't active (i.e. hasn't been shown yet,
     // or is currently shown but deactivated for another WebContents). This is
     // because this window is a singleton, and it's possible another active
@@ skipping 145 matching lines @@
   layout->AddView(hung_pages_table_->CreateParentIfNecessary(), 1, 1,
                   views::GridLayout::FILL,
                   views::GridLayout::FILL, kTableViewWidth, kTableViewHeight);
 
   initialized_ = true;
 }
 
 gfx::Rect HungRendererDialogView::GetDisplayBounds(
     WebContents* contents) {
 #if defined(USE_AURA)
-  gfx::Rect contents_bounds(contents->GetNativeView()->GetBoundsInRootWindow());
+  gfx::Rect contents_bounds(
+      contents->GetView()->GetNativeView()->GetBoundsInRootWindow());
 #elif defined(OS_WIN)
-  HWND contents_hwnd = contents->GetNativeView();
+  HWND contents_hwnd = contents->GetView()->GetNativeView();
   RECT contents_bounds_rect;
   GetWindowRect(contents_hwnd, &contents_bounds_rect);
   gfx::Rect contents_bounds(contents_bounds_rect);
 #endif
   gfx::Rect window_bounds = GetWidget()->GetWindowBoundsInScreen();
 
   int window_x = contents_bounds.x() +
       (contents_bounds.width() - window_bounds.width()) / 2;
   int window_y = contents_bounds.y() + kOverlayContentsOffsetY;
   return gfx::Rect(window_x, window_y, window_bounds.width(),
@@ skipping 21 matching lines @@
 }
 
 void HideHungRendererDialog(WebContents* contents) {
   if (!logging::DialogsAreSuppressed() &&
       !PlatformHideCustomHungRendererDialog(contents) &&
       HungRendererDialogView::GetInstance())
     HungRendererDialogView::GetInstance()->EndForWebContents(contents);
 }
 
 }  // namespace chrome