Reverting issues 8873036 and issues 8933010

ui/aura_shell/launcher/launcher_view.cc

 // Copyright (c) 2011 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 "ui/aura_shell/launcher/launcher_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/launcher/app_launcher_button.h"
 #include "ui/aura_shell/launcher/launcher_model.h"
 #include "ui/aura_shell/launcher/tabbed_launcher_button.h"
 #include "ui/aura_shell/launcher/view_model.h"
 #include "ui/aura_shell/launcher/view_model_utils.h"
-#include "ui/aura_shell/shelf_layout_manager.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
-#include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 
 using ui::Animation;
 using views::View;
 
 namespace aura_shell {
 namespace internal {
 
 // Padding between each view.
 static const int kHorizontalPadding = 12;
@@ skipping 38 matching lines @@
     activated_command_id_ = command_id;
   }
 
  private:
   // ID of the command passed to ExecuteCommand.
   int activated_command_id_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuDelegateImpl);
 };
 
+// ImageButton subclass that animates transition changes using the opacity of
+// the layer.
+class FadeButton : public views::ImageButton {
+ public:
+  explicit FadeButton(views::ButtonListener* listener)
+      : ImageButton(listener) {
+    SetPaintToLayer(true);
+    layer()->SetFillsBoundsOpaquely(false);
+    layer()->SetOpacity(kDimmedButtonOpacity);
+  }
+
+ protected:
+  // ImageButton overrides:
+  virtual SkBitmap GetImageToPaint() OVERRIDE {
+    // ImageButton::GetImageToPaint returns an alpha blended image based on
+    // hover_animation_. FadeButton uses hover_animation to change the opacity
+    // of the layer, so this can be overriden to return the normal image always.
+    return images_[BS_NORMAL];
+  }
+  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE {
+    layer()->SetOpacity(kDimmedButtonOpacity + (1.0f - kDimmedButtonOpacity) *
+                        animation->GetCurrentValue());
+    layer()->ScheduleDraw();
+  }
+  virtual void StateChanged() OVERRIDE {
+    if (!hover_animation_->is_animating()) {
+      float opacity = state_ == BS_NORMAL ? kDimmedButtonOpacity : 1.0f;
+      if (layer()->opacity() != opacity) {
+        layer()->SetOpacity(opacity);
+        layer()->ScheduleDraw();
+      }
+    }
+  }
+  virtual void SchedulePaint() OVERRIDE {
+    // All changes we care about trigger a draw on the layer, so this can be
+    // overriden to do nothing.
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(FadeButton);
+};
+
 // AnimationDelegate that deletes a view when done. This is used when a launcher
 // item is removed, which triggers a remove animation. When the animation is
 // done we delete the view.
 class DeleteViewAnimationDelegate :
       public views::BoundsAnimator::OwnedAnimationDelegate {
  public:
   explicit DeleteViewAnimationDelegate(views::View* view) : view_(view) {}
   virtual ~DeleteViewAnimationDelegate() {}
 
  private:
@@ skipping 23 matching lines @@
     view_->layer()->SetOpacity(1.0f);
     view_->layer()->ScheduleDraw();
   }
 
  private:
   views::View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(FadeInAnimationDelegate);
 };
 
-// Used to draw the background of the shelf.
-class ShelfPainter : public views::Painter {
- public:
-  ShelfPainter() {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    image_ = *rb.GetImageNamed(IDR_AURA_LAUNCHER_BACKGROUND).ToSkBitmap();
-  }
-
-  virtual void Paint(int w, int h, gfx::Canvas* canvas) OVERRIDE {
-    canvas->TileImageInt(image_, 0, 0, w, h);
-  }
-
- private:
-  SkBitmap image_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShelfPainter);
-};
-
-
 }  // namespace
 
 // AnimationDelegate used when inserting a new item. This steadily decreased the
 // opacity of the layer as the animation progress.
 class LauncherView::FadeOutAnimationDelegate :
       public views::BoundsAnimator::OwnedAnimationDelegate {
  public:
   FadeOutAnimationDelegate(LauncherView* host, views::View* view)
       : launcher_view_(host),
         view_(view) {}
@@ skipping 57 matching lines @@
       start_drag_index_(-1) {
   DCHECK(model_);
   bounds_animator_.reset(new views::BoundsAnimator(this));
 }
 
 LauncherView::~LauncherView() {
   model_->RemoveObserver(this);
 }
 
 void LauncherView::Init() {
+  model_->AddObserver(this);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  model_->AddObserver(this);
-
-  set_background(
-      views::Background::CreateBackgroundPainter(true, new ShelfPainter()));
-
-  new_browser_button_ = new views::ImageButton(this);
-  int new_browser_button_image_id =
-      Shell::GetInstance()->delegate()->GetResourceIDForNewBrowserWindow();
+  new_browser_button_ = new FadeButton(this);
   new_browser_button_->SetImage(
       views::CustomButton::BS_NORMAL,
-      rb.GetImageNamed(new_browser_button_image_id).ToSkBitmap());
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_CHROME).ToSkBitmap());
   ConfigureChildView(new_browser_button_);
   AddChildView(new_browser_button_);
 
   const LauncherItems& items(model_->items());
   for (LauncherItems::const_iterator i = items.begin(); i != items.end(); ++i) {
     views::View* child = CreateViewForItem(*i);
     child->SetPaintToLayer(true);
     view_model_->Add(child, static_cast<int>(i - items.begin()));
     AddChildView(child);
   }
 
-  show_apps_button_ = new views::ImageButton(this);
+  show_apps_button_ = new FadeButton(this);
   show_apps_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST).ToSkBitmap());
-  show_apps_button_->SetImage(
-      views::CustomButton::BS_HOT,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_HOT).ToSkBitmap());
-  show_apps_button_->SetImage(
-      views::CustomButton::BS_PUSHED,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED).ToSkBitmap());
   ConfigureChildView(show_apps_button_);
   AddChildView(show_apps_button_);
 
-  overflow_button_ = new views::ImageButton(this);
+  overflow_button_ = new FadeButton(this);
+  // TODO: need image for this.
   overflow_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW).ToSkBitmap());
-  overflow_button_->SetImage(
-      views::CustomButton::BS_HOT,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_HOT).ToSkBitmap());
-  overflow_button_->SetImage(
-      views::CustomButton::BS_PUSHED,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_PUSHED).ToSkBitmap());
   ConfigureChildView(overflow_button_);
   AddChildView(overflow_button_);
 
   // We'll layout when our bounds change.
 }
 
 void LauncherView::LayoutToIdealBounds() {
   IdealBounds ideal_bounds;
   CalculateIdealBounds(&ideal_bounds);
   new_browser_button_->SetBoundsRect(ideal_bounds.new_browser_bounds);
@@ skipping 43 matching lines @@
   overflow_button_->SetVisible(show_overflow);
   if (show_overflow) {
     DCHECK_NE(0, view_model_->view_size());
     x = view_model_->ideal_bounds(last_visible_index).right() +
         kHorizontalPadding;
     bounds->overflow_bounds.set_x(x);
     bounds->overflow_bounds.set_y(
         (kPreferredHeight - bounds->overflow_bounds.height()) / 2);
     x = bounds->overflow_bounds.right() + kHorizontalPadding;
   }
-  // TODO(sky): -6 is a hack, remove when we get better images.
-  bounds->show_apps_bounds.set_x(x - 6);
+  // TODO(sky): -8 is a hack, remove when we get better images.
+  bounds->show_apps_bounds.set_x(x - 8);
   bounds->show_apps_bounds.set_y(
       (kPreferredHeight - bounds->show_apps_bounds.height()) / 2);
 }
 
 int LauncherView::DetermineLastVisibleIndex(int max_x) {
   int index = view_model_->view_size() - 1;
   while (index >= 0 && view_model_->ideal_bounds(index).right() > max_x)
     index--;
   return index;
 }
@@ skipping 253 matching lines @@
   } else {
     int view_index = view_model_->GetIndexOfView(sender);
     // May be -1 while in the process of animating closed.
     if (view_index != -1)
       delegate->LauncherItemClicked(model_->items()[view_index]);
   }
 }
 
 }  // namespace internal
 }  // namespace aura_shell