| Index: ui/views/bubble/bubble_dialog_delegate.cc
|
| diff --git a/ui/views/bubble/bubble_dialog_delegate.cc b/ui/views/bubble/bubble_dialog_delegate.cc
|
| index a893bcf23268a16c9b54f8c428cdc24e021e15dc..9ccce6cf77440254af2f08c3672d47647d9611b9 100644
|
| --- a/ui/views/bubble/bubble_dialog_delegate.cc
|
| +++ b/ui/views/bubble/bubble_dialog_delegate.cc
|
| @@ -208,8 +208,7 @@ BubbleDialogDelegateView::BubbleDialogDelegateView()
|
|
|
| BubbleDialogDelegateView::BubbleDialogDelegateView(View* anchor_view,
|
| BubbleBorder::Arrow arrow)
|
| - : close_on_esc_(true),
|
| - close_on_deactivate_(true),
|
| + : close_on_deactivate_(true),
|
| anchor_view_storage_id_(ViewStorage::GetInstance()->CreateStorageID()),
|
| anchor_widget_(NULL),
|
| arrow_(arrow),
|
| @@ -226,7 +225,6 @@ BubbleDialogDelegateView::BubbleDialogDelegateView(View* anchor_view,
|
| close_reason_(CloseReason::UNKNOWN) {
|
| if (anchor_view)
|
| SetAnchorView(anchor_view);
|
| - AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
|
| UpdateColorsFromTheme(GetNativeTheme());
|
| }
|
|
|
| @@ -244,15 +242,6 @@ const gfx::FontList& BubbleDialogDelegateView::GetTitleFontList() const {
|
| return rb.GetFontList(ui::ResourceBundle::MediumFont);
|
| }
|
|
|
| -bool BubbleDialogDelegateView::AcceleratorPressed(
|
| - const ui::Accelerator& accelerator) {
|
| - if (!close_on_esc() || accelerator.key_code() != ui::VKEY_ESCAPE)
|
| - return false;
|
| - close_reason_ = CloseReason::ESCAPE;
|
| - GetWidget()->Close();
|
| - return true;
|
| -}
|
| -
|
| void BubbleDialogDelegateView::OnNativeThemeChanged(
|
| const ui::NativeTheme* theme) {
|
| UpdateColorsFromTheme(theme);
|
|
|