diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 17:13:28 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 17:13:28 +0000 |
| commit | 2151205d3a847b81b92352648d0f34c12874d4c0 (patch) | |
| tree | 26512f86f2179765f11d7aa08f2c59e79157229b /ash/desktop_background | |
| parent | 66dfcf570d6464178d7627d1a0d3f4b42faa14bb (diff) | |
| download | chromium_src-2151205d3a847b81b92352648d0f34c12874d4c0.zip chromium_src-2151205d3a847b81b92352648d0f34c12874d4c0.tar.gz chromium_src-2151205d3a847b81b92352648d0f34c12874d4c0.tar.bz2 | |
Switching back the backgroung to JPG.
After this is landed I will remove ui/resources/aura/wallpaper.png in CL 9566044.
BUG=105508
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9567037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_view.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index 79470f0..dbf256f 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -30,7 +30,7 @@ static int RoundPositive(double x) { DesktopBackgroundView::DesktopBackgroundView() { wallpaper_ = *ui::ResourceBundle::GetSharedInstance().GetImageNamed( - IDR_AURA_WALLPAPER).ToSkBitmap(); + IDR_AURA_WALLPAPER_1).ToSkBitmap(); wallpaper_.buildMipMap(false); } @@ -71,8 +71,7 @@ void DesktopBackgroundView::OnPaint(gfx::Canvas* canvas) { wallpaper_cropped_rect.width(), wallpaper_cropped_rect.height(), 0, 0, width(), height(), true); - } - else { + } else { // Center the wallpaper in the destination rectangle (Skia will crop // as needed). We might decide later to tile small solid color images. canvas->DrawBitmapInt(wallpaper_, (width() - wallpaper_.width()) / 2, |