Inject CanAddURLToHistory into TopSitesImpl

ash/wm/overview/window_grid.cc

 // Copyright 2014 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/wm/overview/window_grid.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/overview/scoped_transform_overview_window.h"
 #include "ash/wm/overview/window_selector.h"
 #include "ash/wm/overview/window_selector_item.h"
 #include "ash/wm/window_state.h"
 #include "base/command_line.h"
 #include "base/i18n/string_search.h"
 #include "base/memory/scoped_vector.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/views/background.h"
+#include "ui/views/border.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_animations.h"
 
 namespace ash {
 namespace {
 
 typedef std::vector<aura::Window*> Windows;
 
 // An observer which holds onto the passed widget until the animation is
@@ skipping 45 matching lines @@
 // area of them based on the number of window_list.
 const float kCardAspectRatio = 4.0f / 3.0f;
 
 // The minimum number of cards along the major axis (i.e. horizontally on a
 // landscape orientation).
 const int kMinCardsMajor = 3;
 
 const int kOverviewSelectorTransitionMilliseconds = 100;
 
 // The color and opacity of the overview selector.
-const SkColor kWindowOverviewSelectionColor = SK_ColorBLACK;
-const unsigned char kWindowOverviewSelectorOpacity = 128;
+const SkColor kWindowSelectionColor = SkColorSetARGB(128, 0, 0, 0);
+const SkColor kWindowSelectionBorderColor = SkColorSetARGB(38, 255, 255, 255);
+const int kWindowSelectionBorderThickness = 2;
 
 // The minimum amount of spacing between the bottom of the text filtering
 // text field and the top of the selection widget on the first row of items.
 const int kTextFilterBottomMargin = 5;
 
 // Returns the vector for the fade in animation.
 gfx::Vector2d GetSlideVectorForFadeIn(WindowSelector::Direction direction,
                                       const gfx::Rect& bounds) {
   gfx::Vector2d vector;
   switch (direction) {
@@ skipping 254 matching lines @@
   selection_widget_->Init(params);
   // Disable the "bounce in" animation when showing the window.
   ::wm::SetWindowVisibilityAnimationTransition(
       selection_widget_->GetNativeWindow(), ::wm::ANIMATE_NONE);
   // The selection widget should not activate the shelf when passing under it.
   wm::GetWindowState(selection_widget_->GetNativeWindow())->
       set_ignored_by_shelf(true);
 
   views::View* content_view = new views::View;
   content_view->set_background(
-      views::Background::CreateSolidBackground(kWindowOverviewSelectionColor));
+      views::Background::CreateSolidBackground(kWindowSelectionColor));
+  content_view->SetBorder(views::Border::CreateSolidBorder(
+      kWindowSelectionBorderThickness, kWindowSelectionBorderColor));
   selection_widget_->SetContentsView(content_view);
   selection_widget_->GetNativeWindow()->parent()->StackChildAtBottom(
       selection_widget_->GetNativeWindow());
   selection_widget_->Show();
   // New selection widget starts with 0 opacity and then fades in.
   selection_widget_->GetNativeWindow()->layer()->SetOpacity(0);
 
   const gfx::Rect target_bounds = SelectedWindow()->target_bounds();
   gfx::Vector2d fade_out_direction =
           GetSlideVectorForFadeIn(direction, target_bounds);
@@ skipping 49 matching lines @@
 void WindowGrid::MoveSelectionWidgetToTarget(bool animate) {
   if (animate) {
     ui::ScopedLayerAnimationSettings animation_settings(
         selection_widget_->GetNativeWindow()->layer()->GetAnimator());
     animation_settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         kOverviewSelectorTransitionMilliseconds));
     animation_settings.SetTweenType(gfx::Tween::LINEAR_OUT_SLOW_IN);
     animation_settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     selection_widget_->SetBounds(SelectedWindow()->target_bounds());
-    selection_widget_->SetOpacity(kWindowOverviewSelectorOpacity);
+    selection_widget_->SetOpacity(255);
     return;
   }
   selection_widget_->SetBounds(SelectedWindow()->target_bounds());
-  selection_widget_->SetOpacity(kWindowOverviewSelectorOpacity);
+  selection_widget_->SetOpacity(255);
 }
 
 }  // namespace ash