Restore Views dialog dragging and titlebar system menus.

ui/views/bubble/bubble_frame_view.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/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/base/hit_test.h"
@@ skipping 76 matching lines @@
     const gfx::Rect& client_bounds) const {
   return const_cast<BubbleFrameView*>(this)->GetUpdatedWindowBounds(
       gfx::Rect(), client_bounds.size(), false);
 }
 
 int BubbleFrameView::NonClientHitTest(const gfx::Point& point) {
   if (!bounds().Contains(point))
     return HTNOWHERE;
   if (close_->visible() && close_->GetMirroredBounds().Contains(point))
     return HTCLOSE;
-  if (!GetWidget()->widget_delegate()->CanResize())
-    return GetWidget()->client_view()->NonClientHitTest(point);
-
   const int size = bubble_border_->GetBorderThickness() + 4;
-  const int hit = GetHTComponentForFrame(point, size, size, size, size, true);
-  if (hit == HTNOWHERE && point.y() < title_->bounds().bottom())
+  const int sizes = GetHTComponentForFrame(point, size, size, size, size, true);
+  if (GetWidget()->widget_delegate()->CanResize() && sizes != HTNOWHERE)
+    return sizes;
+  // Allow dialogs with bubble frames to be dragged and show the system menu.
+  const int move = std::max(title_->bounds().bottom(), size + 4);
+  if (GetWidget()->widget_delegate()->AsDialogDelegate() != NULL &&
+      GetHTComponentForFrame(point, move, move, move, move, true) != HTNOWHERE)
     return HTCAPTION;
-  return hit;
+  return GetWidget()->client_view()->NonClientHitTest(point);
 }
 
 void BubbleFrameView::GetWindowMask(const gfx::Size& size,
                                     gfx::Path* window_mask) {
   if (bubble_border_->shadow() != BubbleBorder::NO_SHADOW_OPAQUE_BORDER)
     return;
 
   // Use a window mask roughly matching the border in the image assets.
   static const int kBorderStrokeSize = 1;
   static const SkScalar kCornerRadius = SkIntToScalar(6);
@@ skipping 189 matching lines @@
   // |offscreen_adjust|, e.g. positive |offscreen_adjust| means bubble
   // window needs to be moved to the right and that means we need to move arrow
   // to the left, and that means negative offset.
   bubble_border_->set_arrow_offset(
       bubble_border_->GetArrowOffset(window_bounds.size()) - offscreen_adjust);
   if (offscreen_adjust)
     SchedulePaint();
 }
 
 }  // namespace views