Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: ash/desktop_background/desktop_background_view.cc

Issue 9567037: Switching back the backgroung to JPG. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/desktop_background/desktop_background_view.cc
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc
index 79470f0dbddb8f9ddf40cab326ee3758554f3604..dbf256f0499df461eccbaff9cee46a3b78ca9305 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,
« no previous file with comments | « no previous file | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698