| Index: athena/main/placeholder.cc
|
| diff --git a/athena/main/placeholder.cc b/athena/main/placeholder.cc
|
| index c3c907e3f53ac3dc19459ae2f3e9736817fb3ff4..ba93ce87142ef6894382832d705b090c2400e060 100644
|
| --- a/athena/main/placeholder.cc
|
| +++ b/athena/main/placeholder.cc
|
| @@ -7,11 +7,9 @@
|
| #include "athena/activity/public/activity_factory.h"
|
| #include "athena/activity/public/activity_manager.h"
|
| #include "athena/screen/public/screen_manager.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "third_party/skia/include/core/SkColor.h"
|
| -#include "ui/gfx/canvas.h"
|
| +#include "grit/athena_resources.h"
|
| +#include "ui/base/resource/resource_bundle.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| -#include "ui/views/painter.h"
|
|
|
| void CreateTestPages(content::BrowserContext* browser_context) {
|
| const char* kTestURLs[] = {
|
| @@ -26,11 +24,7 @@ void CreateTestPages(content::BrowserContext* browser_context) {
|
| }
|
|
|
| void SetupBackgroundImage() {
|
| - gfx::Size size(200, 200);
|
| - gfx::Canvas canvas(size, 1.0f, true);
|
| - scoped_ptr<views::Painter> painter(
|
| - views::Painter::CreateVerticalGradient(SK_ColorBLUE, SK_ColorCYAN));
|
| - painter->Paint(&canvas, size);
|
| - athena::ScreenManager::Get()->SetBackgroundImage(
|
| - gfx::ImageSkia(canvas.ExtractImageRep()));
|
| + const gfx::ImageSkia wallpaper = *ui::ResourceBundle::GetSharedInstance()
|
| + .GetImageSkiaNamed(IDR_ATHENA_BACKGROUND);
|
| + athena::ScreenManager::Get()->SetBackgroundImage(wallpaper);
|
| }
|
|
|