Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Unified Diff: chrome/browser/chromeos/arc/arc_service_launcher.cc

Issue 2264743002: cheets: implement cros side of WallpaperManagerService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cheets: implement cros side of WallpaperManagerService. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/arc/arc_service_launcher.cc
diff --git a/chrome/browser/chromeos/arc/arc_service_launcher.cc b/chrome/browser/chromeos/arc/arc_service_launcher.cc
index 384d7f42f14c1e642cf8be813b1b96f78a0602c4..a454affd65794907d1bfe4f6a60a4aaba8d601e3 100644
--- a/chrome/browser/chromeos/arc/arc_service_launcher.cc
+++ b/chrome/browser/chromeos/arc/arc_service_launcher.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/chromeos/arc/arc_process_service.h"
#include "chrome/browser/chromeos/arc/arc_settings_service.h"
#include "chrome/browser/chromeos/arc/arc_tts_service.h"
-#include "chrome/browser/chromeos/arc/arc_wallpaper_handler.h"
+#include "chrome/browser/chromeos/arc/arc_wallpaper_service.h"
#include "chrome/browser/chromeos/arc/gpu_arc_video_service_host.h"
#include "components/arc/arc_bridge_service.h"
#include "components/arc/intent_helper/arc_intent_helper_bridge.h"
@@ -31,6 +31,9 @@ void ArcServiceLauncher::Initialize() {
// Create ARC service manager.
arc_service_manager_ = base::MakeUnique<ArcServiceManager>(
content::BrowserThread::GetBlockingPool());
+ std::unique_ptr<ArcService> arc_wallpaper_handler_ =
hidehiko 2016/09/02 05:07:13 nit: Please remove trailing underscore.
Muyuan 2016/09/06 19:53:41 Acknowledged.
+ base::MakeUnique<ArcWallpaperService>(
+ arc_service_manager_->arc_bridge_service());
arc_service_manager_->AddService(base::MakeUnique<ArcAuthService>(
arc_service_manager_->arc_bridge_service()));
arc_service_manager_->AddService(base::MakeUnique<ArcBootErrorNotification>(
@@ -43,7 +46,7 @@ void ArcServiceLauncher::Initialize() {
arc_service_manager_->AddService(base::MakeUnique<ArcIntentHelperBridge>(
arc_service_manager_->arc_bridge_service(),
arc_service_manager_->icon_loader(),
- base::MakeUnique<ArcWallpaperHandler>(),
+ (ArcWallpaperService*)arc_wallpaper_handler_.get(),
hidehiko 2016/09/02 05:07:13 This can be use-after-free. IIUC, the element dest
Luis Héctor Chávez 2016/09/02 16:23:47 Another approach (since this will be removed very
Muyuan 2016/09/06 19:53:41 Done.
arc_service_manager_->activity_resolver()));
arc_service_manager_->AddService(base::MakeUnique<ArcPolicyBridge>(
arc_service_manager_->arc_bridge_service()));
@@ -57,6 +60,7 @@ void ArcServiceLauncher::Initialize() {
arc_service_manager_->arc_bridge_service()));
arc_service_manager_->AddService(base::MakeUnique<GpuArcVideoServiceHost>(
arc_service_manager_->arc_bridge_service()));
+ arc_service_manager_->AddService(std::move(arc_wallpaper_handler_));
}
void ArcServiceLauncher::Shutdown() {

Powered by Google App Engine
This is Rietveld 408576698