Create a visible shelf and constrain window movement

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 123 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) {

[sky, 2011/12/14 06:23:05]

PVERRODE

[DaveMoore, 2011/12/14 17:03:19]

Done.

+    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) {}
   virtual ~FadeOutAnimationDelegate() {}
 
   // AnimationDelegate overrides:
   virtual void AnimationProgressed(const Animation* animation) OVERRIDE {
     view_->layer()->SetOpacity(1 - animation->GetCurrentValue());
     view_->layer()->ScheduleDraw();
   }
   virtual void AnimationEnded(const Animation* animation) OVERRIDE {
     launcher_view_->AnimateToIdealBounds();
   }
   virtual void AnimationCanceled(const Animation* animation) OVERRIDE {
   }
 
  private:
   LauncherView* launcher_view_;
   scoped_ptr<views::View> view_;
 
   DISALLOW_COPY_AND_ASSIGN(FadeOutAnimationDelegate);
 };
 

[sky, 2011/12/14 06:23:05]

remove this line

[DaveMoore, 2011/12/14 17:03:19]

Done.

+
 // AnimationDelegate used to trigger fading an element in. When an item is
 // inserted this delegate is attached to the animation that expands the size of
 // the item.  When done it kicks off another animation to fade the item in.
 class LauncherView::StartFadeAnimationDelegate :
       public views::BoundsAnimator::OwnedAnimationDelegate {
  public:
   StartFadeAnimationDelegate(LauncherView* host,
                              views::View* view)
       : launcher_view_(host),
         view_(view) {}
@@ skipping 29 matching lines @@
   bounds_animator_.reset(new views::BoundsAnimator(this));
 }
 
 LauncherView::~LauncherView() {
   model_->RemoveObserver(this);
 }
 
 void LauncherView::Init() {
   model_->AddObserver(this);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+
+  set_background(
+      views::Background::CreateBackgroundPainter(true, new ShelfPainter()));
   new_browser_button_ = new FadeButton(this);
   new_browser_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       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);
@@ skipping 345 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