Now that the launcher is sized to the width of the root window we need

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 81 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 60 matching lines @@
 }
 
 LauncherView::~LauncherView() {
   model_->RemoveObserver(this);
 }
 
 void LauncherView::Init() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   model_->AddObserver(this);
 
-  set_background(
-      views::Background::CreateBackgroundPainter(true, new ShelfPainter()));
-
   new_browser_button_ = new views::ImageButton(this);
   ShellDelegate* delegate = Shell::GetInstance()->delegate();
   int new_browser_button_image_id = delegate ?
       delegate->GetResourceIDForNewBrowserWindow() :
       IDR_AURA_LAUNCHER_ICON_CHROME;
   new_browser_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       rb.GetImageNamed(new_browser_button_image_id).ToSkBitmap());
   ConfigureChildView(new_browser_button_);
   AddChildView(new_browser_button_);
@@ skipping 360 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