Remove default action in permission bubbles

chrome/browser/ui/views/website_settings/permission_prompt_impl.cc

 // Copyright 2014 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 "chrome/browser/ui/views/website_settings/permission_prompt_impl.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 146 matching lines @@
   // BubbleDialogDelegateView:
   bool ShouldShowCloseButton() const override;
   const gfx::FontList& GetTitleFontList() const override;
   base::string16 GetWindowTitle() const override;
   void OnWidgetDestroying(views::Widget* widget) override;
   gfx::Size GetPreferredSize() const override;
   void GetAccessibleState(ui::AXViewState* state) override;
   bool Cancel() override;
   bool Accept() override;
   bool Close() override;
+  int GetDefaultDialogButton() const override;
   int GetDialogButtons() const override;
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
 
   // PermissionCombobox::Listener:
   void PermissionSelectionChanged(int index, bool allowed) override;
 
   // Updates the anchor's arrow and view. Also repositions the bubble so it's
   // displayed in the correct location.
   void UpdateAnchor(views::View* anchor_view,
                     const gfx::Point& anchor_point,
@@ skipping 120 matching lines @@
   const int kWidth = 320 - GetInsets().width();
   return gfx::Size(kWidth, GetHeightForWidth(kWidth));
 }
 
 void PermissionsBubbleDialogDelegateView::GetAccessibleState(
     ui::AXViewState* state) {
   views::BubbleDialogDelegateView::GetAccessibleState(state);
   state->role = ui::AX_ROLE_ALERT_DIALOG;
 }
 
+int PermissionsBubbleDialogDelegateView::GetDefaultDialogButton() const {
+  // To prevent permissions being accepted accidentally, and as a security
+  // measure against crbug.com/619429, permission prompts should not be accepted
+  // as the default action.
+  return ui::DIALOG_BUTTON_NONE;

[felt, 2016/08/04 00:17:29]

Does this have the side effect of changing the button order?

[benwells, 2016/08/04 05:09:00]

No, button ordering is controlled here:
https://cs.chromium.org/chromium/src/ui/views/window/dialog_client_view.cc?rc...
and isn't based on the default button.

[felt, 2016/08/04 23:53:29]

oh!! that does have the side effect of making this much simpler than i thought.

+}
+
 int PermissionsBubbleDialogDelegateView::GetDialogButtons() const {
   int buttons = ui::DIALOG_BUTTON_OK;
   if (!multiple_requests_)
     buttons |= ui::DIALOG_BUTTON_CANCEL;
   return buttons;
 }
 
 base::string16 PermissionsBubbleDialogDelegateView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_CANCEL)
@@ skipping 132 matching lines @@
 
 void PermissionPromptImpl::Accept() {
   if (delegate_)
     delegate_->Accept();
 }
 
 void PermissionPromptImpl::Deny() {
   if (delegate_)
     delegate_->Deny();
 }