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

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

Issue 84113002: Reverse the change in crrev.com/222879 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: enable-test Created 7 years, 1 month 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 | « no previous file | ui/views/widget/widget_unittest.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 ab0172815037c8057a4ba3aafedae93f2d6aed41..aa6db8ee194ddbc8c6d5c205db17247682f1079a 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -159,18 +159,12 @@ class DesktopNativeWidgetAuraWindowTreeClient :
virtual aura::Window* GetDefaultParent(aura::Window* context,
aura::Window* window,
const gfx::Rect& bounds) OVERRIDE {
- bool full_screen = window->GetProperty(aura::client::kShowStateKey) ==
+ bool is_fullscreen = window->GetProperty(aura::client::kShowStateKey) ==
ui::SHOW_STATE_FULLSCREEN;
- bool is_menu = false;
- // TODO(erg): We need to be able to spawn and deal with toplevel windows if
- // we want the popups to extend past our window
- // bounds. http://crbug.com/288988
-#if !defined(OS_LINUX)
- is_menu = window->type() == aura::client::WINDOW_TYPE_MENU;
-#endif
- if (full_screen || is_menu) {
+ bool is_menu = window->type() == aura::client::WINDOW_TYPE_MENU;
+ if (is_fullscreen || is_menu) {
return DesktopNativeWidgetTopLevelHandler::CreateParentWindow(
- window, bounds, full_screen);
+ window, bounds, is_fullscreen);
}
return root_window_;
}
« no previous file with comments | « no previous file | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698