Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/arc/arc_service_launcher.h" | 5 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "chrome/browser/chromeos/arc/arc_auth_service.h" | 9 #include "chrome/browser/chromeos/arc/arc_auth_service.h" |
| 10 #include "chrome/browser/chromeos/arc/arc_downloads_watcher_service.h" | 10 #include "chrome/browser/chromeos/arc/arc_downloads_watcher_service.h" |
| 11 #include "chrome/browser/chromeos/arc/arc_policy_bridge.h" | 11 #include "chrome/browser/chromeos/arc/arc_policy_bridge.h" |
| 12 #include "chrome/browser/chromeos/arc/arc_process_service.h" | 12 #include "chrome/browser/chromeos/arc/arc_process_service.h" |
| 13 #include "chrome/browser/chromeos/arc/arc_settings_service.h" | 13 #include "chrome/browser/chromeos/arc/arc_settings_service.h" |
| 14 #include "chrome/browser/chromeos/arc/arc_wallpaper_handler.h" | |
| 14 #include "chrome/browser/chromeos/arc/gpu_arc_video_service_host.h" | 15 #include "chrome/browser/chromeos/arc/gpu_arc_video_service_host.h" |
| 15 #include "chromeos/dbus/dbus_thread_manager.h" | 16 #include "chromeos/dbus/dbus_thread_manager.h" |
| 16 #include "chromeos/dbus/session_manager_client.h" | 17 #include "chromeos/dbus/session_manager_client.h" |
| 17 #include "components/arc/arc_bridge_service.h" | 18 #include "components/arc/arc_bridge_service.h" |
| 19 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" | |
| 18 #include "content/public/browser/browser_thread.h" | 20 #include "content/public/browser/browser_thread.h" |
| 19 | 21 |
| 20 namespace arc { | 22 namespace arc { |
| 21 | 23 |
| 22 ArcServiceLauncher::ArcServiceLauncher() : weak_factory_(this) {} | 24 ArcServiceLauncher::ArcServiceLauncher() : weak_factory_(this) {} |
| 23 | 25 |
| 24 ArcServiceLauncher::~ArcServiceLauncher() {} | 26 ArcServiceLauncher::~ArcServiceLauncher() {} |
| 25 | 27 |
| 26 void ArcServiceLauncher::Initialize() { | 28 void ArcServiceLauncher::Initialize() { |
| 27 // Create ARC service manager. | 29 // Create ARC service manager. |
| 28 arc_service_manager_.reset( | 30 arc_service_manager_.reset( |
| 29 new ArcServiceManager(content::BrowserThread::GetBlockingPool())); | 31 new ArcServiceManager(content::BrowserThread::GetBlockingPool())); |
| 30 arc_service_manager_->AddService(base::WrapUnique( | 32 arc_service_manager_->AddService(base::WrapUnique( |
| 33 new ArcIntentHelperBridge(arc_service_manager_->arc_bridge_service(), | |
| 34 arc_service_manager_->icon_loader(), | |
| 35 content::BrowserThread::GetBlockingPool(), | |
| 36 base::WrapUnique(new ArcWallpaperHandler())))); | |
|
Yusuke Sato
2016/06/15 16:45:01
MakeUnique? (here and elsewhere).
base/memory/ptr
Shuhei Takahashi
2016/06/15 18:14:37
Sure, that's better.
| |
| 37 arc_service_manager_->AddService(base::WrapUnique( | |
| 31 new ArcAuthService(arc_service_manager_->arc_bridge_service()))); | 38 new ArcAuthService(arc_service_manager_->arc_bridge_service()))); |
| 32 arc_service_manager_->AddService( | 39 arc_service_manager_->AddService( |
| 33 base::WrapUnique(new ArcDownloadsWatcherService( | 40 base::WrapUnique(new ArcDownloadsWatcherService( |
| 34 arc_service_manager_->arc_bridge_service()))); | 41 arc_service_manager_->arc_bridge_service()))); |
| 35 arc_service_manager_->AddService(base::WrapUnique( | 42 arc_service_manager_->AddService(base::WrapUnique( |
| 36 new ArcPolicyBridge(arc_service_manager_->arc_bridge_service()))); | 43 new ArcPolicyBridge(arc_service_manager_->arc_bridge_service()))); |
| 37 arc_service_manager_->AddService(base::WrapUnique( | 44 arc_service_manager_->AddService(base::WrapUnique( |
| 38 new ArcProcessService(arc_service_manager_->arc_bridge_service()))); | 45 new ArcProcessService(arc_service_manager_->arc_bridge_service()))); |
| 39 arc_service_manager_->AddService(base::WrapUnique( | 46 arc_service_manager_->AddService(base::WrapUnique( |
| 40 new ArcSettingsService(arc_service_manager_->arc_bridge_service()))); | 47 new ArcSettingsService(arc_service_manager_->arc_bridge_service()))); |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 53 arc_service_manager_->Shutdown(); | 60 arc_service_manager_->Shutdown(); |
| 54 arc_service_manager_->arc_bridge_service()->Shutdown(); | 61 arc_service_manager_->arc_bridge_service()->Shutdown(); |
| 55 } | 62 } |
| 56 | 63 |
| 57 void ArcServiceLauncher::OnArcAvailable(bool arc_available) { | 64 void ArcServiceLauncher::OnArcAvailable(bool arc_available) { |
| 58 arc_service_manager_->arc_bridge_service()->SetDetectedAvailability( | 65 arc_service_manager_->arc_bridge_service()->SetDetectedAvailability( |
| 59 arc_available); | 66 arc_available); |
| 60 } | 67 } |
| 61 | 68 |
| 62 } // namespace arc | 69 } // namespace arc |
| OLD | NEW |