Use the same blue solid border among tray and launcher, for focus.

ash/launcher/launcher_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/launcher/launcher_view.h"
 
 #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"
 #include "ash/launcher/launcher_icon_observer.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_tooltip_manager.h"
 #include "ash/launcher/overflow_bubble.h"
 #include "ash/launcher/overflow_button.h"
 #include "ash/launcher/tabbed_launcher_button.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "base/auto_reset.h"
 #include "base/memory/scoped_ptr.h"
 #include "grit/ash_strings.h"
 #include "grit/ash_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/border.h"
 #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"
 
 using ui::Animation;
 using views::View;
 
 namespace ash {
 namespace internal {
 
@@ skipping 40 matching lines @@
     }
     return view_model_->view_at(index);
   }
 
  private:
   views::ViewModel* view_model_;
 
   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 {
  public:
   MenuDelegateImpl() : activated_command_id_(-1) {}
 
   int activated_command_id() const { return activated_command_id_; }
 
   // ui::SimpleMenuModel::Delegate overrides:
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
@@ skipping 419 matching lines @@
           IDR_AURA_LAUNCHER_BROWSER_SHORTCUT;
       button->SetImage(*rb.GetImageNamed(image_id).ToImageSkia());
       view = button;
       break;
     }
 
     default:
       break;
   }
   view->set_context_menu_controller(this);
+  view->set_focus_border(new LauncherButtonFocusBorder);
 
   DCHECK(view);
   ConfigureChildView(view);
   return view;
 }
 
 void LauncherView::FadeIn(views::View* view) {
   view->SetVisible(true);
   view->layer()->SetOpacity(0);
   AnimateToIdealBounds();
@@ skipping 528 matching lines @@
   FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
                     OnLauncherIconPositionsChanged());
   PreferredSizeChanged();
 }
 
 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) {
 }
 
 }  // namespace internal
 }  // namespace ash