Fix wallpaper change to a random one when user first click "set wallpaper".

chrome/browser/chromeos/background/desktop_background_observer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/background/desktop_background_observer.h"
 
 #include "ash/shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "base/logging.h"
@@ skipping 10 matching lines @@
 
 class UserWallpaperDelegate: public ash::UserWallpaperDelegate {
  public:
   UserWallpaperDelegate() {
   }
 
   virtual ~UserWallpaperDelegate() {
   }
 
   virtual const int GetUserWallpaperIndex() OVERRIDE {
-    chromeos::UserManager* user_manager = chromeos::UserManager::Get();
-    // If at login screen or logged in as a guest/incognito user, then use the
-    // default wallpaper.
-    if (user_manager->IsLoggedInAsGuest() || !user_manager->IsUserLoggedIn())
-      return ash::GetGuestWallpaperIndex();
-
-    const chromeos::User& user = user_manager->GetLoggedInUser();
-    DCHECK(!user.email().empty());
-    int index = user_manager->GetUserWallpaper(user.email());
-    DCHECK(index >=0 && index < ash::GetWallpaperCount());
-    return index;
+    return chromeos::UserManager::Get()->GetUserWallpaperIndex();
   }
 
   virtual void OpenSetWallpaperPage() OVERRIDE {
     Browser* browser = Browser::GetOrCreateTabbedBrowser(
         ProfileManager::GetDefaultProfileOrOffTheRecord());
     browser->ShowOptionsTab("setWallpaper");
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate);
@@ skipping 23 matching lines @@
       ash::Shell::GetInstance()->desktop_background_controller()->
           OnDesktopBackgroundChanged();
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace chromeos