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

Unified Diff: chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc

Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc
===================================================================
--- chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc (revision 177189)
+++ chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc (working copy)
@@ -10,10 +10,6 @@
#include "content/public/browser/web_contents_view.h"
#include "ui/base/text/text_elider.h"
-#if defined(USE_AURA)
-#include "ui/aura/root_window.h"
-#endif
-
using content::JavaScriptDialogCreator;
using content::WebContents;
@@ -84,13 +80,6 @@
NativeAppModalDialog* JavaScriptAppModalDialog::CreateNativeDialog() {
gfx::NativeWindow parent_window =
web_contents()->GetView()->GetTopLevelNativeWindow();
-#if defined(USE_AURA)
- if (!parent_window->GetRootWindow()) {
- // When we are part of a WebContents that isn't actually being displayed on
- // the screen, we can't actually attach to it.
- parent_window = NULL;
- }
-#endif
return NativeAppModalDialog::CreateNativeJavaScriptPrompt(this,
parent_window);
}
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698