Refactor modality-specific behavior from ConstrainedWindowViews to WebContentsModalDialogManager

ui/views/widget/widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/events/event.h"
@@ skipping 182 matching lines @@
       disable_inactive_rendering_(false),
       widget_closed_(false),
       saved_show_state_(ui::SHOW_STATE_DEFAULT),
       focus_on_creation_(true),
       is_top_level_(false),
       native_widget_initialized_(false),
       native_widget_destroyed_(false),
       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() {
   while (!event_stack_.empty()) {
     event_stack_.top()->reset();
     event_stack_.pop();
   }
 
   DestroyRootView();
   if (ownership_ == InitParams::WIDGET_OWNS_NATIVE_WIDGET) {
@@ skipping 900 matching lines @@
 }
 
 void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) {
   // On Linux Aura, we can get here during Init() because of the
   // SetInitialBounds call.
   if (native_widget_initialized_)
   GetRootView()->Paint(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 still? how about HTCLIENT?

[Mike Wittman, 2013/01/23 21:52:31]

Yes, I checked and we still get mouse events in Widget::OnMouseEvent for a
HTNOWHERE result.  It looks like HWNDMessageHandler::OnNCHitTest explicitly
checks for HTNOWHERE and doesn't propagate it back to Windows.

+    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) {
   ScopedEvent scoped(this, *event);
   static_cast<internal::RootView*>(GetRootView())->
       DispatchKeyEvent(event);
 }
 
 void Widget::OnMouseEvent(ui::MouseEvent* event) {
   ScopedEvent scoped(this, *event);
@@ skipping 268 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views