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

chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.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/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h"
 
+#include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_resources.h"
+#include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 61 matching lines @@
 
 void SetWallpaperOptionsHandler::HandlePageInitialized(
     const base::ListValue* args) {
   DCHECK(args && args->empty());
 
   SendDefaultImages();
 }
 
 void SetWallpaperOptionsHandler::HandlePageShown(const base::ListValue* args) {
   DCHECK(args && args->empty());
-  chromeos::UserManager* user_manager = chromeos::UserManager::Get();
-  const chromeos::User& user = user_manager->GetLoggedInUser();
-  DCHECK(!user.email().empty());
-  int index = user_manager->GetUserWallpaper(user.email());
-  DCHECK(index >=0 && index < ash::GetWallpaperCount());
+  int index = chromeos::UserManager::Get()->GetUserWallpaperIndex();
   base::FundamentalValue index_value(index);
   web_ui()->CallJavascriptFunction("SetWallpaperOptions.setSelectedImage",
                                    index_value);
 }
 
 void SetWallpaperOptionsHandler::HandleSelectImage(const ListValue* args) {
   std::string image_index_string;
   int image_index;
   if (!args ||
       args->GetSize() != 1 ||
       !args->GetString(0, &image_index_string) ||
       !base::StringToInt(image_index_string, &image_index) ||
       image_index < 0 || image_index >= ash::GetWallpaperCount())
     NOTREACHED();
 
-  UserManager* user_manager = UserManager::Get();
-  const User& user = user_manager->GetLoggedInUser();
-  DCHECK(!user.email().empty());
-  user_manager->SaveWallpaperDefaultIndex(user.email(), image_index);
+  UserManager::Get()->SaveUserWallpaperIndex(image_index);
+  ash::Shell::GetInstance()->desktop_background_controller()->
+      OnDesktopBackgroundChanged();
 }
 
 gfx::NativeWindow SetWallpaperOptionsHandler::GetBrowserWindow() const {
   Browser* browser =
       BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui()));
   if (!browser)
     return NULL;
   return browser->window()->GetNativeHandle();
 }
 
 }  // namespace options2
 }  // namespace chromeos