diff options
| -rw-r--r-- | ash/launcher/launcher.cc | 27 | ||||
| -rw-r--r-- | ui/resources/aura/launcher_background.png | bin | 986 -> 0 bytes | |||
| -rw-r--r-- | ui/resources/ui_resources.grd | 1 |
3 files changed, 0 insertions, 28 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() { diff --git a/ui/resources/aura/launcher_background.png b/ui/resources/aura/launcher_background.png Binary files differdeleted file mode 100644 index 20db244..0000000 --- a/ui/resources/aura/launcher_background.png +++ /dev/null diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 4b4816e..4071819 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -153,7 +153,6 @@ <include name="IDR_AURA_LAUNCHER_ICON_APPLIST" file="aura/applist.png" type="BINDATA" /> <include name="IDR_AURA_LAUNCHER_ICON_APPLIST_HOT" file="aura/applist_h.png" type="BINDATA" /> <include name="IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED" file="aura/applist_p.png" type="BINDATA" /> - <include name="IDR_AURA_LAUNCHER_BACKGROUND" file="aura/launcher_background.png" type="BINDATA" /> <include name="IDR_AURA_SHADOW_ACTIVE_TOP_LEFT" file="aura/window_shadow_active_top_left.png" type="BINDATA" /> <include name="IDR_AURA_SHADOW_ACTIVE_TOP" file="aura/window_shadow_active_top.png" type="BINDATA" /> <include name="IDR_AURA_SHADOW_ACTIVE_TOP_RIGHT" file="aura/window_shadow_active_top_right.png" type="BINDATA" /> |
