| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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_api.h" | 5 #include "chrome/browser/chromeos/extensions/wallpaper_api.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 SendResponse(true); | 241 SendResponse(true); |
| 242 } | 242 } |
| 243 | 243 |
| 244 // Inform the native Wallpaper Picker Application that the current wallpaper | 244 // Inform the native Wallpaper Picker Application that the current wallpaper |
| 245 // has been modified by a third party application. | 245 // has been modified by a third party application. |
| 246 if (extension()->id() != extension_misc::kWallpaperManagerId) { | 246 if (extension()->id() != extension_misc::kWallpaperManagerId) { |
| 247 Profile* profile = Profile::FromBrowserContext(browser_context()); | 247 Profile* profile = Profile::FromBrowserContext(browser_context()); |
| 248 extensions::EventRouter* event_router = | 248 extensions::EventRouter* event_router = |
| 249 extensions::EventRouter::Get(profile); | 249 extensions::EventRouter::Get(profile); |
| 250 std::unique_ptr<base::ListValue> event_args(new base::ListValue()); | 250 std::unique_ptr<base::ListValue> event_args(new base::ListValue()); |
| 251 event_args->Append(original_result->DeepCopy()); | 251 event_args->Append(original_result->CreateDeepCopy()); |
| 252 event_args->Append(thumbnail_result->DeepCopy()); | 252 event_args->Append(thumbnail_result->CreateDeepCopy()); |
| 253 event_args->AppendString( | 253 event_args->AppendString( |
| 254 extensions::api::wallpaper::ToString(params_->details.layout)); | 254 extensions::api::wallpaper::ToString(params_->details.layout)); |
| 255 // Setting wallpaper from right click menu in 'Files' app is a feature that | 255 // Setting wallpaper from right click menu in 'Files' app is a feature that |
| 256 // was implemented in crbug.com/578935. Since 'Files' app is a built-in v1 | 256 // was implemented in crbug.com/578935. Since 'Files' app is a built-in v1 |
| 257 // app in ChromeOS, we should treat it slightly differently with other third | 257 // app in ChromeOS, we should treat it slightly differently with other third |
| 258 // party apps: the wallpaper set by the 'Files' app should still be syncable | 258 // party apps: the wallpaper set by the 'Files' app should still be syncable |
| 259 // and it should not appear in the wallpaper grid in the Wallpaper Picker. | 259 // and it should not appear in the wallpaper grid in the Wallpaper Picker. |
| 260 // But we should not display the 'wallpaper-set-by-mesage' since it might | 260 // But we should not display the 'wallpaper-set-by-mesage' since it might |
| 261 // introduce confusion as shown in crbug.com/599407. | 261 // introduce confusion as shown in crbug.com/599407. |
| 262 event_args->AppendString( | 262 event_args->AppendString( |
| (...skipping 15 matching lines...) Expand all Loading... |
| 278 const std::string& response) { | 278 const std::string& response) { |
| 279 if (success) { | 279 if (success) { |
| 280 params_->details.data.reset( | 280 params_->details.data.reset( |
| 281 new std::vector<char>(response.begin(), response.end())); | 281 new std::vector<char>(response.begin(), response.end())); |
| 282 StartDecode(*params_->details.data); | 282 StartDecode(*params_->details.data); |
| 283 } else { | 283 } else { |
| 284 SetError(response); | 284 SetError(response); |
| 285 SendResponse(false); | 285 SendResponse(false); |
| 286 } | 286 } |
| 287 } | 287 } |
| OLD | NEW |