Commit 3f83b996 authored by Marijn Kruisselbrink's avatar Marijn Kruisselbrink Committed by Commit Bot

[Native File System] Make "accept" button be default but not focused in permission prompt.

Bug: 985602, 987260
Change-Id: I8ee8c01fed607b42c3bf15a97333652c9c74b2ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1730862
Commit-Queue: Victor Costan <pwnall@chromium.org>
Reviewed-by: default avatarVictor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684159}
parent 0a5758c4
...@@ -67,7 +67,7 @@ base::string16 NativeFileSystemPermissionView::GetWindowTitle() const { ...@@ -67,7 +67,7 @@ base::string16 NativeFileSystemPermissionView::GetWindowTitle() const {
} }
int NativeFileSystemPermissionView::GetDefaultDialogButton() const { int NativeFileSystemPermissionView::GetDefaultDialogButton() const {
return ui::DIALOG_BUTTON_NONE; return ui::DIALOG_BUTTON_OK;
} }
base::string16 NativeFileSystemPermissionView::GetDialogButtonLabel( base::string16 NativeFileSystemPermissionView::GetDialogButtonLabel(
...@@ -103,6 +103,10 @@ ui::ModalType NativeFileSystemPermissionView::GetModalType() const { ...@@ -103,6 +103,10 @@ ui::ModalType NativeFileSystemPermissionView::GetModalType() const {
return ui::MODAL_TYPE_CHILD; return ui::MODAL_TYPE_CHILD;
} }
views::View* NativeFileSystemPermissionView::GetInitiallyFocusedView() {
return GetDialogClientView()->cancel_button();
}
void ShowNativeFileSystemPermissionDialog( void ShowNativeFileSystemPermissionDialog(
const url::Origin& origin, const url::Origin& origin,
const base::FilePath& path, const base::FilePath& path,
......
...@@ -53,6 +53,7 @@ class NativeFileSystemPermissionView : public views::DialogDelegateView { ...@@ -53,6 +53,7 @@ class NativeFileSystemPermissionView : public views::DialogDelegateView {
bool Cancel() override; bool Cancel() override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
ui::ModalType GetModalType() const override; ui::ModalType GetModalType() const override;
views::View* GetInitiallyFocusedView() override;
private: private:
NativeFileSystemPermissionView( NativeFileSystemPermissionView(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment