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

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

Issue 12045037: Refactor modality-specific behavior from ConstrainedWindowViews to WebContentsModalDialogManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 8a1923df928acbbe7594a567b13bae45e083b8cc..d8d78d5ff1cdaa4c96c784f839cb5f839ce51db4 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -200,7 +200,8 @@ Widget::Widget()
is_mouse_button_pressed_(false),
is_touch_down_(false),
last_mouse_event_was_move_(false),
- root_layers_dirty_(false) {
+ root_layers_dirty_(false),
+ movement_disabled_(false) {
}
Widget::~Widget() {
@@ -1121,9 +1122,14 @@ void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) {
}
int Widget::GetNonClientComponent(const gfx::Point& point) {
- return non_client_view_ ?
+ int component = non_client_view_ ?
non_client_view_->NonClientHitTest(point) :
HTNOWHERE;
+
+ if (movement_disabled_ && (component == HTCAPTION || component == HTSYSMENU))
Ben Goodger (Google) 2013/01/23 19:10:46 HTNOWHERE... will this cause events to get sent st
Mike Wittman 2013/01/23 21:52:31 Yes, I checked and we still get mouse events in Wi
+ return HTNOWHERE;
+ else
+ return component;
Ben Goodger (Google) 2013/01/23 19:10:46 nit: no else after return
Mike Wittman 2013/01/23 21:52:31 Done.
}
void Widget::OnKeyEvent(ui::KeyEvent* event) {
« chrome/browser/ui/web_contents_modal_dialog_manager_ui_delegate.h ('K') | « ui/views/widget/widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698