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

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT 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 | « ui/views/views.gyp ('k') | ui/views/widget/desktop_aura/desktop_screen_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index 953fac6a7f207d7d9e3f0e4a39ecdbad0bb17e2c..baa3dbe3d52c10eae8ff315d5bc4c2256427a60a 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -283,8 +283,12 @@ void DesktopNativeWidgetAura::SetAccessibleState(
}
void DesktopNativeWidgetAura::InitModalType(ui::ModalType modal_type) {
- // We should never be asked to create a DesktopNativeWidgetAura that is modal.
- DCHECK_EQ(ui::MODAL_TYPE_NONE, modal_type);
+ // 99% of the time, we should not be asked to create a
+ // DesktopNativeWidgetAura that is modal. The case where this breaks down is
+ // when there are no browser windows and a background extension tries to
+ // display a simple alert dialog. (This case was masked because we used to
+ // have a hidden RootWindow which was the parent of these modal dialogs; they
+ // weren't displayed to the user.)
}
gfx::Rect DesktopNativeWidgetAura::GetWindowBoundsInScreen() const {
« no previous file with comments | « ui/views/views.gyp ('k') | ui/views/widget/desktop_aura/desktop_screen_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698