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

Unified Diff: views/widget/widget_win.cc

Issue 790005: Modify WidgetWin::Init() such that it doesn't create the FocusManager if the ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/widget_win.cc
===================================================================
--- views/widget/widget_win.cc (revision 41153)
+++ views/widget/widget_win.cc (working copy)
@@ -130,9 +130,12 @@
drop_target_ = new DropTargetWin(root_view_.get());
if ((window_style() & WS_CHILD) == 0 ||
- WidgetWin::GetRootWidget(parent) == NULL) {
+ (WidgetWin::GetRootWidget(parent) == NULL &&
+ parent != GetDesktopWindow())) {
// Top-level widgets and child widgets who do not have a top-level widget
- // ancestor get a FocusManager.
+ // ancestor get a FocusManager. Child widgets parented to the desktop do not
+ // get a FocusManager because parenting to the desktop is the technique used
+ // to intentionally exclude a widget from the FocusManager hierarchy.
focus_manager_.reset(new FocusManager(this));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698