Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(933)

Unified Diff: chrome/browser/ui/views/hung_renderer_view.cc

Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/hung_renderer_view.cc
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc
index b54f77e9a2737f068fe67cd41d498b7aed01588c..af2ab498154d7c795dacf9372118ef9ae7e6118f 100644
--- a/chrome/browser/ui/views/hung_renderer_view.cc
+++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -22,6 +22,7 @@
#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"
@@ -206,7 +207,7 @@ HungRendererDialogView* HungRendererDialogView::GetInstance() {
// 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);
}
@@ -244,7 +245,7 @@ void HungRendererDialogView::ShowForWebContents(WebContents* contents) {
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);
@@ -410,9 +411,10 @@ void HungRendererDialogView::Init() {
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);
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/speech_recognition_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698