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

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

Issue 797413002: MacViews: Compile more Views source files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for sky and rebase Created 6 years 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
« no previous file with comments | « chrome/browser/ui/views/hung_renderer_view.h ('k') | chrome/browser/ui/views/toolbar/toolbar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 aa099295b12e95ab6ad123414b3b773cd826c106..353826a8f4e06b1ea01a7b0c36476602b960652b 100644
--- a/chrome/browser/ui/views/hung_renderer_view.cc
+++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -174,7 +174,7 @@ static const int kCentralColumnPadding =
// static
HungRendererDialogView* HungRendererDialogView::Create(
- gfx::NativeView context) {
+ gfx::NativeWindow context) {
if (!g_instance_) {
g_instance_ = new HungRendererDialogView;
views::DialogDelegate::CreateDialogWidget(g_instance_, context, NULL);
@@ -189,9 +189,9 @@ HungRendererDialogView* HungRendererDialogView::GetInstance() {
// static
bool HungRendererDialogView::IsFrameActive(WebContents* contents) {
- gfx::NativeView frame_view =
+ gfx::NativeWindow window =
platform_util::GetTopLevel(contents->GetNativeView());
- return platform_util::IsWindowActive(frame_view);
+ return platform_util::IsWindowActive(window);
}
// static
@@ -236,10 +236,10 @@ void HungRendererDialogView::ShowForWebContents(WebContents* contents) {
GetWidget(), manager->GetWebContentsModalDialogHost());
}
- gfx::NativeView frame_view =
+ gfx::NativeWindow window =
platform_util::GetTopLevel(contents->GetNativeView());
views::Widget* insert_after =
- views::Widget::GetWidgetForNativeView(frame_view);
+ views::Widget::GetWidgetForNativeWindow(window);
if (insert_after)
GetWidget()->StackAboveWidget(insert_after);
@@ -430,14 +430,16 @@ void ShowHungRendererDialog(WebContents* contents) {
if (logging::DialogsAreSuppressed())
return;
- gfx::NativeView toplevel_view =
+ gfx::NativeWindow window =
platform_util::GetTopLevel(contents->GetNativeView());
+#if defined(USE_AURA)
// Don't show the dialog if there is no root window for the renderer, because
// it's invisible to the user (happens when the renderer is for prerendering
// for example).
- if (!toplevel_view->GetRootWindow())
+ if (!window->GetRootWindow())
return;
- HungRendererDialogView* view = HungRendererDialogView::Create(toplevel_view);
+#endif
+ HungRendererDialogView* view = HungRendererDialogView::Create(window);
view->ShowForWebContents(contents);
}
« no previous file with comments | « chrome/browser/ui/views/hung_renderer_view.h ('k') | chrome/browser/ui/views/toolbar/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698