Make dialogs not draggable by default.

Updated a few known cases that should be draggable.

Bug: 930782
Change-Id: I09ba7e0a71097317d241042e16a89f28dd27f4a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1570126
Commit-Queue: Charlene Yan <cyan@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Joe Mason <joenotcharles@google.com>
Cr-Commit-Position: refs/heads/master@{#652665}

chrome/browser/ui/views/chrome_cleaner_reboot_dialog_win.cc

@@ -122,6 +122,10 @@ bool ChromeCleanerRebootDialog::Close() {
   return true;
 }
 
+bool ChromeCleanerRebootDialog::IsDialogDraggable() const {
+  return true;
+}
+
 void ChromeCleanerRebootDialog::HandleDialogInteraction(
     DialogInteractionResult result) {
   if (!dialog_controller_)

chrome/browser/ui/views/chrome_cleaner_reboot_dialog_win.h

@@ -44,6 +44,7 @@ class ChromeCleanerRebootDialog : public views::DialogDelegateView {
   bool Accept() override;
   bool Cancel() override;
   bool Close() override;
+  bool IsDialogDraggable() const override;
 
  private:
   enum class DialogInteractionResult {

chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

@@ -388,6 +388,13 @@ bool ExtensionInstallDialogView::Accept() {
   return true;
 }
 
+// parent_window() may be null if an upgrade permissions prompt is triggered
+// when launching via a desktop shortcut. In that case, there is no browser
+// window to move (which would move the dialog), so allow dragging in this case.
+bool ExtensionInstallDialogView::IsDialogDraggable() const {
+  return !parent_window();
+}
+
 int ExtensionInstallDialogView::GetDialogButtons() const {
   int buttons = prompt_->GetDialogButtons();
   // Simply having just an OK button is *not* supported. See comment on function

chrome/browser/ui/views/extensions/extension_install_dialog_view.h

@@ -58,6 +58,7 @@ class ExtensionInstallDialogView : public views::BubbleDialogDelegateView,
   views::View* CreateExtraView() override;
   bool Cancel() override;
   bool Accept() override;
+  bool IsDialogDraggable() const override;
   int GetDialogButtons() const override;
   int GetDefaultDialogButton() const override;
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;

chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc

@@ -158,6 +158,10 @@ bool EnterpriseStartupDialogView::Close() {
   return Cancel();
 }
 
+bool EnterpriseStartupDialogView::IsDialogDraggable() const {
+  return true;
+}
+
 bool EnterpriseStartupDialogView::ShouldShowWindowTitle() const {
   return false;
 }

chrome/browser/ui/views/policy/enterprise_startup_dialog_view.h

@@ -44,6 +44,7 @@ class EnterpriseStartupDialogView : public views::DialogDelegateView {
   bool Accept() override;
   bool Cancel() override;
   bool Close() override;
+  bool IsDialogDraggable() const override;
   bool ShouldShowWindowTitle() const override;
   ui::ModalType GetModalType() const override;
   views::View* CreateExtraView() override;

ui/views/bubble/bubble_frame_view.cc

@@ -192,8 +192,7 @@ int BubbleFrameView::NonClientHitTest(const gfx::Point& point) {
 
   if (point.y() < title()->bounds().bottom()) {
     auto* dialog_delegate = GetWidget()->widget_delegate()->AsDialogDelegate();
-    // Allow the dialog to be dragged if it is not a bubble dialog.
-    if (dialog_delegate && !dialog_delegate->AsBubbleDialogDelegate()) {
+    if (dialog_delegate && dialog_delegate->IsDialogDraggable()) {
       return HTCAPTION;
     }
   }

ui/views/window/dialog_delegate.cc

@@ -151,6 +151,10 @@ bool DialogDelegate::Close() {
   return Accept();
 }
 
+bool DialogDelegate::IsDialogDraggable() const {
+  return false;
+}
+
 void DialogDelegate::UpdateButton(LabelButton* button, ui::DialogButton type) {
   button->SetText(GetDialogButtonLabel(type));
   button->SetEnabled(IsDialogButtonEnabled(type));

ui/views/window/dialog_delegate.h

@@ -101,6 +101,10 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {
   // must remain open.
   virtual bool Close();
 
+  // Dialogs should not be draggable unless the dialog can be created with no
+  // parent browser window.
+  virtual bool IsDialogDraggable() const;
+
   // Updates the properties and appearance of |button| which has been created
   // for type |type|. Override to do special initialization above and beyond
   // the typical.

ui/views/window/dialog_delegate_unittest.cc

@@ -57,6 +57,7 @@ class TestDialog : public DialogDelegateView {
     closed_ = true;
     return closeable_;
   }
+  bool IsDialogDraggable() const override { return true; }
 
   gfx::Size CalculatePreferredSize() const override {
     return gfx::Size(200, 200);