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

Unified Diff: ui/views/widget/widget.h

Issue 378333003: Allow menus to stay open during a child view's drag and drop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
Index: ui/views/widget/widget.h
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index bc3f91473dd19de5175b0b939a69341424b7a329..1610faf8901dcc6b11ad52c7538ce4ab88f0f43c 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -793,6 +793,11 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// TODO(beng): remove once we fold those objects onto this one.
void DestroyRootView();
+ bool child_drag_in_progress() const { return child_drag_in_progress_; }
+ void set_child_drag_in_progress(bool child_drag_in_progress) {
+ child_drag_in_progress_ = child_drag_in_progress;
+ }
+
private:
friend class ComboboxTest;
friend class TextfieldTest;
@@ -858,6 +863,9 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// started from.
View* dragged_view_;
+ // Whether or not a child of this widget is in the middle of a drag.
+ bool child_drag_in_progress_;
Devlin 2014/07/09 18:28:44 This name isn't strictly true, since only the top-
+
// See class documentation for Widget above for a note about ownership.
InitParams::Ownership ownership_;

Powered by Google App Engine
This is Rietveld 408576698