From c5be11f4e5663736128f7c0b34af155155a27806 Mon Sep 17 00:00:00 2001 From: "mazda@chromium.org" Date: Mon, 14 Nov 2011 13:33:23 +0000 Subject: Move views::Accelerator to ui in order to use it from aura code. This is the first preliminary change for the support of global keyboard shortcut. BUG=97255 TEST=None Review URL: http://codereview.chromium.org/8508055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109872 0039d316-1c4b-4281-b951-d872f2087c98 --- views/bubble/bubble_delegate.cc | 7 ++++--- views/bubble/bubble_delegate.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'views/bubble') diff --git a/views/bubble/bubble_delegate.cc b/views/bubble/bubble_delegate.cc index 9f99747..f5efff1 100644 --- a/views/bubble/bubble_delegate.cc +++ b/views/bubble/bubble_delegate.cc @@ -83,7 +83,7 @@ BubbleDelegateView::BubbleDelegateView() border_widget_(NULL), use_focusless_(false) { set_background(views::Background::CreateSolidBackground(color_)); - AddAccelerator(Accelerator(ui::VKEY_ESCAPE, 0)); + AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, 0)); } BubbleDelegateView::BubbleDelegateView( @@ -100,7 +100,7 @@ BubbleDelegateView::BubbleDelegateView( border_widget_(NULL), use_focusless_(false) { set_background(views::Background::CreateSolidBackground(color_)); - AddAccelerator(Accelerator(ui::VKEY_ESCAPE, 0)); + AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, 0)); } BubbleDelegateView::~BubbleDelegateView() { @@ -215,7 +215,8 @@ void BubbleDelegateView::ResetFade() { GetWidget()->SetOpacity(original_opacity_); } -bool BubbleDelegateView::AcceleratorPressed(const Accelerator& accelerator) { +bool BubbleDelegateView::AcceleratorPressed( + const ui::Accelerator& accelerator) { if (!close_on_esc() || accelerator.key_code() != ui::VKEY_ESCAPE) return false; if (fade_animation_.get()) diff --git a/views/bubble/bubble_delegate.h b/views/bubble/bubble_delegate.h index be02e44..55eb2e1 100644 --- a/views/bubble/bubble_delegate.h +++ b/views/bubble/bubble_delegate.h @@ -88,7 +88,7 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView, protected: // View overrides: - virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // Perform view initialization on the contents for bubble sizing. virtual void Init(); -- cgit v1.1