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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ui/views/widget/widget_hwnd_utils.cc

Issue 291013003: Revert 271468 "Revert of [Refactor] Consolidate the logic for wh..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | « trunk/src/ui/views/widget/widget.cc ('k') | trunk/src/ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/widget/widget_hwnd_utils.cc
===================================================================
--- trunk/src/ui/views/widget/widget_hwnd_utils.cc (revision 271508)
+++ trunk/src/ui/views/widget/widget_hwnd_utils.cc (working copy)
@@ -41,7 +41,8 @@
*style |= WS_MINIMIZE;
if (!params.accept_events)
*ex_style |= WS_EX_TRANSPARENT;
- if (!params.can_activate)
+ DCHECK_NE(Widget::InitParams::ACTIVATABLE_DEFAULT, params.activatable);
+ if (params.activatable == Widget::InitParams::ACTIVATABLE_NO)
*ex_style |= WS_EX_NOACTIVATE;
if (params.keep_on_top)
*ex_style |= WS_EX_TOPMOST;
« no previous file with comments | « trunk/src/ui/views/widget/widget.cc ('k') | trunk/src/ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698