Chromium Code Reviews| Index: components/arc/intent_helper/arc_intent_helper_bridge.cc |
| diff --git a/components/arc/intent_helper/arc_intent_helper_bridge.cc b/components/arc/intent_helper/arc_intent_helper_bridge.cc |
| index 64176dde1c09fb92f4d975f9b5d73ef6f534b039..5b753fa336095e7b8bd97fcd13412aa953e00153 100644 |
| --- a/components/arc/intent_helper/arc_intent_helper_bridge.cc |
| +++ b/components/arc/intent_helper/arc_intent_helper_bridge.cc |
| @@ -28,15 +28,17 @@ constexpr char kArcIntentHelperPackageName[] = "org.chromium.arc.intent_helper"; |
| } // namespace |
| +// TODO(muyuanli): This will be removed once SetWallpaperDelegate class is |
| +// removed. |
| +SetWallpaperDelegate* SetWallpaperDelegate::instance_ = nullptr; |
|
Luis Héctor Chávez
2016/09/08 19:14:24
for future reference: you should have added a set_
Muyuan
2016/09/08 21:05:25
Acknowledged.
|
| + |
| ArcIntentHelperBridge::ArcIntentHelperBridge( |
| ArcBridgeService* bridge_service, |
| const scoped_refptr<ActivityIconLoader>& icon_loader, |
| - std::unique_ptr<SetWallpaperDelegate> set_wallpaper_delegate, |
| const scoped_refptr<LocalActivityResolver>& activity_resolver) |
| : ArcService(bridge_service), |
| binding_(this), |
| icon_loader_(icon_loader), |
| - set_wallpaper_delegate_(std::move(set_wallpaper_delegate)), |
| activity_resolver_(activity_resolver) { |
| DCHECK(thread_checker_.CalledOnValidThread()); |
| arc_bridge_service()->intent_helper()->AddObserver(this); |
| @@ -87,7 +89,12 @@ void ArcIntentHelperBridge::OpenWallpaperPicker() { |
| void ArcIntentHelperBridge::SetWallpaper(mojo::Array<uint8_t> jpeg_data) { |
| DCHECK(thread_checker_.CalledOnValidThread()); |
| - set_wallpaper_delegate_->SetWallpaper(jpeg_data.PassStorage()); |
| + SetWallpaperDelegate* delegate = SetWallpaperDelegate::GetInstance(); |
| + if (delegate == nullptr) { |
| + LOG(ERROR) << "SetWallpaperDelegate is not available."; |
| + return; |
| + } |
| + delegate->SetWallpaperJpeg(jpeg_data.PassStorage()); |
| } |
| std::unique_ptr<ash::LinkHandlerModel> ArcIntentHelperBridge::CreateModel( |