diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 07:06:56 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 07:06:56 +0000 |
| commit | 82a5e71e56435d0ae75c5012aa97ec575631e724 (patch) | |
| tree | 44cc55dc082160ee699f1baacaba1e7de3a10520 /ash | |
| parent | f3ec1a82f7f65c74572fa5e982c52d944eb84439 (diff) | |
| download | chromium_src-82a5e71e56435d0ae75c5012aa97ec575631e724.zip chromium_src-82a5e71e56435d0ae75c5012aa97ec575631e724.tar.gz chromium_src-82a5e71e56435d0ae75c5012aa97ec575631e724.tar.bz2 | |
Change the launcher to use AccessiblePaneView, and make the buttons focusable
R=sky@chromium.org
BUG=104192
TEST=None
Review URL: http://codereview.chromium.org/9113056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/launcher/app_launcher_button.cc | 1 | ||||
| -rw-r--r-- | ash/launcher/launcher.cc | 13 | ||||
| -rw-r--r-- | ash/launcher/launcher_view.cc | 1 | ||||
| -rw-r--r-- | ash/launcher/tabbed_launcher_button.cc | 1 |
4 files changed, 15 insertions, 1 deletions
diff --git a/ash/launcher/app_launcher_button.cc b/ash/launcher/app_launcher_button.cc index 2f08304..ae23d19 100644 --- a/ash/launcher/app_launcher_button.cc +++ b/ash/launcher/app_launcher_button.cc @@ -21,6 +21,7 @@ AppLauncherButton::AppLauncherButton(views::ButtonListener* listener, host_(host) { SetImageAlignment(views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE); + set_focusable(true); } AppLauncherButton::~AppLauncherButton() { diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc index c172088..61810e2 100644 --- a/ash/launcher/launcher.cc +++ b/ash/launcher/launcher.cc @@ -15,6 +15,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/image/image.h" +#include "ui/views/accessible_pane_view.h" #include "ui/views/painter.h" #include "ui/views/widget/widget.h" @@ -44,7 +45,8 @@ class ShelfPainter : public views::Painter { // The contents view of the Widget. This view contains LauncherView and // sizes it to the width of the widget minus the size of the status area. -class Launcher::DelegateView : public views::WidgetDelegateView { +class Launcher::DelegateView : public views::WidgetDelegate, + public views::AccessiblePaneView { public: explicit DelegateView(); virtual ~DelegateView(); @@ -56,6 +58,15 @@ class Launcher::DelegateView : public views::WidgetDelegateView { virtual gfx::Size GetPreferredSize() OVERRIDE; virtual void Layout() OVERRIDE; + virtual views::Widget* GetWidget() OVERRIDE { + return View::GetWidget(); + } + + virtual const views::Widget* GetWidget() const OVERRIDE { + return View::GetWidget(); + } + + private: int status_width_; diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index 8826b37..d674bb3 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -210,6 +210,7 @@ void LauncherView::Init() { } overflow_button_ = new views::ImageButton(this); + overflow_button_->set_focusable(true); overflow_button_->SetImage( views::CustomButton::BS_NORMAL, rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW).ToSkBitmap()); diff --git a/ash/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc index 2745cd4..09da1a9 100644 --- a/ash/launcher/tabbed_launcher_button.cc +++ b/ash/launcher/tabbed_launcher_button.cc @@ -64,6 +64,7 @@ TabbedLauncherButton::TabbedLauncherButton(views::ButtonListener* listener, } SetImageAlignment(views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE); + set_focusable(true); } TabbedLauncherButton::~TabbedLauncherButton() { |