summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-23 17:18:37 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-23 17:18:37 +0000
commitcccdb792cbe7b444949b87fc981d091dfba8bd96 (patch)
tree209db35b78123aac0c24f85b2185b130ab34f8ec /ash
parent52e456b96b2b2c82a24a63a1d0cfc90904a5a72c (diff)
downloadchromium_src-cccdb792cbe7b444949b87fc981d091dfba8bd96.zip
chromium_src-cccdb792cbe7b444949b87fc981d091dfba8bd96.tar.gz
chromium_src-cccdb792cbe7b444949b87fc981d091dfba8bd96.tar.bz2
Removes the background from the launcher per latest mocks.
BUG=none TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9443004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123265 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/launcher/launcher.cc27
1 files changed, 0 insertions, 27 deletions
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index 9f678e9..f5c9cc7 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -11,9 +11,7 @@
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/shell_window_ids.h"
-#include "grit/ui_resources.h"
#include "ui/aura/window.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"
@@ -24,29 +22,6 @@
namespace ash {
-namespace {
-
-// 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();
- }
-
- // Overridden from views::Painter:
- virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) OVERRIDE {
- canvas->TileImageInt(image_, 0, 0, size.width(), size.height());
- }
-
- private:
- SkBitmap image_;
-
- DISALLOW_COPY_AND_ASSIGN(ShelfPainter);
-};
-
-} // namespace
-
// The contents view of the Widget. This view contains LauncherView and
// sizes it to the width of the widget minus the size of the status area.
class Launcher::DelegateView : public views::WidgetDelegate,
@@ -91,8 +66,6 @@ class Launcher::DelegateView : public views::WidgetDelegate,
Launcher::DelegateView::DelegateView()
: status_width_(0),
focus_cycler_(NULL) {
- set_background(
- views::Background::CreateBackgroundPainter(true, new ShelfPainter()));
}
Launcher::DelegateView::~DelegateView() {