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 b502d0cd32dd331fb667f9895b052ed5e9beb363..64176dde1c09fb92f4d975f9b5d73ef6f534b039 100644 |
--- a/components/arc/intent_helper/arc_intent_helper_bridge.cc |
+++ b/components/arc/intent_helper/arc_intent_helper_bridge.cc |
@@ -28,17 +28,15 @@ |
} // namespace |
-// TODO(muyuanli): This will be removed once SetWallpaperDelegate class is |
-// removed. |
-SetWallpaperDelegate* SetWallpaperDelegate::instance_ = nullptr; |
- |
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); |
@@ -89,12 +87,7 @@ |
void ArcIntentHelperBridge::SetWallpaper(mojo::Array<uint8_t> jpeg_data) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
- SetWallpaperDelegate* delegate = SetWallpaperDelegate::instance(); |
- if (delegate == nullptr) { |
- LOG(ERROR) << "SetWallpaperDelegate is not available."; |
- return; |
- } |
- delegate->SetWallpaperJpeg(jpeg_data.PassStorage()); |
+ set_wallpaper_delegate_->SetWallpaper(jpeg_data.PassStorage()); |
} |
std::unique_ptr<ash::LinkHandlerModel> ArcIntentHelperBridge::CreateModel( |