| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h" | 5 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "ash/desktop_background/desktop_background_controller.h" | 10 #include "ash/desktop_background/desktop_background_controller.h" |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 IDS_CURRENT_WALLPAPER_SET_BY_MESSAGE); | 266 IDS_CURRENT_WALLPAPER_SET_BY_MESSAGE); |
| 267 #undef SET_STRING | 267 #undef SET_STRING |
| 268 | 268 |
| 269 webui::SetFontAndTextDirection(dict); | 269 webui::SetFontAndTextDirection(dict); |
| 270 | 270 |
| 271 chromeos::WallpaperManager* wallpaper_manager = | 271 chromeos::WallpaperManager* wallpaper_manager = |
| 272 chromeos::WallpaperManager::Get(); | 272 chromeos::WallpaperManager::Get(); |
| 273 chromeos::WallpaperInfo info; | 273 chromeos::WallpaperInfo info; |
| 274 | 274 |
| 275 if (wallpaper_manager->GetLoggedInUserWallpaperInfo(&info)) | 275 if (wallpaper_manager->GetLoggedInUserWallpaperInfo(&info)) |
| 276 dict->SetString("currentWallpaper", info.file); | 276 dict->SetString("currentWallpaper", info.location); |
| 277 | 277 |
| 278 #if defined(GOOGLE_CHROME_BUILD) | 278 #if defined(GOOGLE_CHROME_BUILD) |
| 279 dict->SetString("manifestBaseURL", kWallpaperManifestBaseURL); | 279 dict->SetString("manifestBaseURL", kWallpaperManifestBaseURL); |
| 280 #endif | 280 #endif |
| 281 | 281 |
| 282 Profile* profile = Profile::FromBrowserContext(browser_context()); | 282 Profile* profile = Profile::FromBrowserContext(browser_context()); |
| 283 std::string app_name( | 283 std::string app_name( |
| 284 profile->GetPrefs()->GetString(prefs::kCurrentWallpaperAppName)); | 284 profile->GetPrefs()->GetString(prefs::kCurrentWallpaperAppName)); |
| 285 if (!app_name.empty()) | 285 if (!app_name.empty()) |
| 286 dict->SetString("wallpaperAppName", app_name); | 286 dict->SetString("wallpaperAppName", app_name); |
| (...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 877 this, file_list)); | 877 this, file_list)); |
| 878 } | 878 } |
| 879 | 879 |
| 880 void WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete( | 880 void WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete( |
| 881 const std::vector<std::string>& file_list) { | 881 const std::vector<std::string>& file_list) { |
| 882 base::ListValue* results = new base::ListValue(); | 882 base::ListValue* results = new base::ListValue(); |
| 883 results->AppendStrings(file_list); | 883 results->AppendStrings(file_list); |
| 884 SetResult(results); | 884 SetResult(results); |
| 885 SendResponse(true); | 885 SendResponse(true); |
| 886 } | 886 } |
| OLD | NEW |