diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 18:48:51 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 18:48:51 +0000 |
| commit | 2b3df1bb2eb056d4be22e278787f75f6475c73fe (patch) | |
| tree | b906238ab0f746c2357fc1a4884f3f738aa226f2 /ash/launcher | |
| parent | d5e9f10b883a42d8b78540088de8531c773c1707 (diff) | |
| download | chromium_src-2b3df1bb2eb056d4be22e278787f75f6475c73fe.zip chromium_src-2b3df1bb2eb056d4be22e278787f75f6475c73fe.tar.gz chromium_src-2b3df1bb2eb056d4be22e278787f75f6475c73fe.tar.bz2 | |
Use the same blue solid border among tray and launcher, for focus.
BUG=158345
Review URL: https://chromiumcodereview.appspot.com/11306012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher_view.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index c5044ad..12f689e 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "ash/ash_constants.h" #include "ash/launcher/app_list_button.h" #include "ash/launcher/launcher_button.h" #include "ash/launcher/launcher_delegate.h" @@ -33,6 +34,7 @@ #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/focus/focus_search.h" +#include "ui/views/focus_border.h" #include "ui/views/view_model.h" #include "ui/views/view_model_utils.h" #include "ui/views/widget/widget.h" @@ -93,6 +95,22 @@ class LauncherFocusSearch : public views::FocusSearch { DISALLOW_COPY_AND_ASSIGN(LauncherFocusSearch); }; +class LauncherButtonFocusBorder : public views::FocusBorder { + public: + LauncherButtonFocusBorder() {} + virtual ~LauncherButtonFocusBorder() {} + + private: + // views::FocusBorder overrides: + virtual void Paint(const View& view, gfx::Canvas* canvas) const OVERRIDE { + gfx::Rect rect(view.GetLocalBounds()); + rect.Inset(1, 1); + canvas->DrawRect(rect, kFocusBorderColor); + } + + DISALLOW_COPY_AND_ASSIGN(LauncherButtonFocusBorder); +}; + // ui::SimpleMenuModel::Delegate implementation that remembers the id of the // menu that was activated. class MenuDelegateImpl : public ui::SimpleMenuModel::Delegate { @@ -532,6 +550,7 @@ views::View* LauncherView::CreateViewForItem(const LauncherItem& item) { break; } view->set_context_menu_controller(this); + view->set_focus_border(new LauncherButtonFocusBorder); DCHECK(view); ConfigureChildView(view); |