| 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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 for (UserIDHashWindowListMap::iterator iter = | 224 for (UserIDHashWindowListMap::iterator iter = |
| 225 user_id_hash_window_list_map_.begin(); | 225 user_id_hash_window_list_map_.begin(); |
| 226 iter != user_id_hash_window_list_map_.end(); | 226 iter != user_id_hash_window_list_map_.end(); |
| 227 ++iter) { | 227 ++iter) { |
| 228 iter->second.erase(window); | 228 iter->second.erase(window); |
| 229 } | 229 } |
| 230 } | 230 } |
| 231 | 231 |
| 232 } // namespace | 232 } // namespace |
| 233 | 233 |
| 234 bool WallpaperPrivateGetStringsFunction::RunImpl() { | 234 bool WallpaperPrivateGetStringsFunction::RunSync() { |
| 235 base::DictionaryValue* dict = new base::DictionaryValue(); | 235 base::DictionaryValue* dict = new base::DictionaryValue(); |
| 236 SetResult(dict); | 236 SetResult(dict); |
| 237 | 237 |
| 238 #define SET_STRING(id, idr) \ | 238 #define SET_STRING(id, idr) \ |
| 239 dict->SetString(id, l10n_util::GetStringUTF16(idr)) | 239 dict->SetString(id, l10n_util::GetStringUTF16(idr)) |
| 240 SET_STRING("webFontFamily", IDS_WEB_FONT_FAMILY); | 240 SET_STRING("webFontFamily", IDS_WEB_FONT_FAMILY); |
| 241 SET_STRING("webFontSize", IDS_WEB_FONT_SIZE); | 241 SET_STRING("webFontSize", IDS_WEB_FONT_SIZE); |
| 242 SET_STRING("allCategoryLabel", IDS_WALLPAPER_MANAGER_ALL_CATEGORY_LABEL); | 242 SET_STRING("allCategoryLabel", IDS_WALLPAPER_MANAGER_ALL_CATEGORY_LABEL); |
| 243 SET_STRING("deleteCommandLabel", IDS_WALLPAPER_MANAGER_DELETE_COMMAND_LABEL); | 243 SET_STRING("deleteCommandLabel", IDS_WALLPAPER_MANAGER_DELETE_COMMAND_LABEL); |
| 244 SET_STRING("customCategoryLabel", | 244 SET_STRING("customCategoryLabel", |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 848 this, file_list)); | 848 this, file_list)); |
| 849 } | 849 } |
| 850 | 850 |
| 851 void WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete( | 851 void WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete( |
| 852 const std::vector<std::string>& file_list) { | 852 const std::vector<std::string>& file_list) { |
| 853 base::ListValue* results = new base::ListValue(); | 853 base::ListValue* results = new base::ListValue(); |
| 854 results->AppendStrings(file_list); | 854 results->AppendStrings(file_list); |
| 855 SetResult(results); | 855 SetResult(results); |
| 856 SendResponse(true); | 856 SendResponse(true); |
| 857 } | 857 } |
| OLD | NEW |