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

Side by Side Diff: chrome/browser/chromeos/arc/arc_service_launcher.cc

Issue 2436763004: More graceful shutdown for ArcSession. (Closed)
Patch Set: Add StopArcInstance Created 4 years, 2 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 unified diff | Download patch
OLDNEW
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/logging.h" 7 #include "base/logging.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_boot_error_notification.h" 10 #include "chrome/browser/chromeos/arc/arc_boot_error_notification.h"
11 #include "chrome/browser/chromeos/arc/arc_downloads_watcher_service.h" 11 #include "chrome/browser/chromeos/arc/arc_downloads_watcher_service.h"
12 #include "chrome/browser/chromeos/arc/arc_enterprise_reporting_service.h" 12 #include "chrome/browser/chromeos/arc/arc_enterprise_reporting_service.h"
13 #include "chrome/browser/chromeos/arc/arc_policy_bridge.h" 13 #include "chrome/browser/chromeos/arc/arc_policy_bridge.h"
14 #include "chrome/browser/chromeos/arc/arc_print_service.h" 14 #include "chrome/browser/chromeos/arc/arc_print_service.h"
15 #include "chrome/browser/chromeos/arc/arc_process_service.h" 15 #include "chrome/browser/chromeos/arc/arc_process_service.h"
16 #include "chrome/browser/chromeos/arc/arc_settings_service.h" 16 #include "chrome/browser/chromeos/arc/arc_settings_service.h"
17 #include "chrome/browser/chromeos/arc/arc_tts_service.h" 17 #include "chrome/browser/chromeos/arc/arc_tts_service.h"
18 #include "chrome/browser/chromeos/arc/arc_wallpaper_service.h" 18 #include "chrome/browser/chromeos/arc/arc_wallpaper_service.h"
19 #include "chrome/browser/chromeos/arc/gpu_arc_video_service_host.h" 19 #include "chrome/browser/chromeos/arc/gpu_arc_video_service_host.h"
20 #include "components/arc/arc_bridge_service.h"
21 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" 20 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
22 #include "content/public/browser/browser_thread.h" 21 #include "content/public/browser/browser_thread.h"
23 22
24 namespace arc { 23 namespace arc {
25 24
26 ArcServiceLauncher::ArcServiceLauncher() = default; 25 ArcServiceLauncher::ArcServiceLauncher() = default;
27 26
28 ArcServiceLauncher::~ArcServiceLauncher() = default; 27 ArcServiceLauncher::~ArcServiceLauncher() = default;
29 28
30 void ArcServiceLauncher::Initialize() { 29 void ArcServiceLauncher::Initialize() {
(...skipping 25 matching lines...) Expand all
56 arc_service_manager_->arc_bridge_service())); 55 arc_service_manager_->arc_bridge_service()));
57 arc_service_manager_->AddService(base::MakeUnique<ArcWallpaperService>( 56 arc_service_manager_->AddService(base::MakeUnique<ArcWallpaperService>(
58 arc_service_manager_->arc_bridge_service())); 57 arc_service_manager_->arc_bridge_service()));
59 arc_service_manager_->AddService(base::MakeUnique<GpuArcVideoServiceHost>( 58 arc_service_manager_->AddService(base::MakeUnique<GpuArcVideoServiceHost>(
60 arc_service_manager_->arc_bridge_service())); 59 arc_service_manager_->arc_bridge_service()));
61 } 60 }
62 61
63 void ArcServiceLauncher::Shutdown() { 62 void ArcServiceLauncher::Shutdown() {
64 DCHECK(arc_service_manager_); 63 DCHECK(arc_service_manager_);
65 arc_service_manager_->Shutdown(); 64 arc_service_manager_->Shutdown();
66 arc_service_manager_->arc_bridge_service()->Shutdown();
67 } 65 }
68 66
69 } // namespace arc 67 } // namespace arc
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_auth_service_browsertest.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698