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

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

Issue 2723073002: Extract kArcEnabled preference from ArcSessionManager part 2. (Closed)
Patch Set: address comments Created 3 years, 9 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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/threading/sequenced_worker_pool.h" 12 #include "base/threading/sequenced_worker_pool.h"
13 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.h" 13 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.h"
14 #include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bri dge.h" 14 #include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bri dge.h"
15 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 15 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
16 #include "chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler. h"
16 #include "chrome/browser/chromeos/arc/arc_session_manager.h" 17 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
17 #include "chrome/browser/chromeos/arc/arc_util.h" 18 #include "chrome/browser/chromeos/arc/arc_util.h"
18 #include "chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_ bridge.h" 19 #include "chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_ bridge.h"
19 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h" 20 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h"
20 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h" 21 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h"
21 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.h " 22 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.h "
22 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_service.h" 23 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_service.h"
23 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h" 24 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h"
24 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h " 25 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h "
25 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" 26 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 // Kiosk apps should be run only for kiosk sessions. 177 // Kiosk apps should be run only for kiosk sessions.
177 if (user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp()) { 178 if (user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp()) {
178 // ArcKioskAppService is BrowserContextKeyedService so that it's destroyed 179 // ArcKioskAppService is BrowserContextKeyedService so that it's destroyed
179 // on destroying the Profile, that is after ArcServiceLauncher::Shutdown(). 180 // on destroying the Profile, that is after ArcServiceLauncher::Shutdown().
180 arc_service_manager_->AddService(base::MakeUnique<ArcKioskBridge>( 181 arc_service_manager_->AddService(base::MakeUnique<ArcKioskBridge>(
181 arc_service_manager_->arc_bridge_service(), 182 arc_service_manager_->arc_bridge_service(),
182 chromeos::ArcKioskAppService::Get(profile))); 183 chromeos::ArcKioskAppService::Get(profile)));
183 } 184 }
184 185
185 arc_session_manager_->SetProfile(profile); 186 arc_session_manager_->SetProfile(profile);
186 arc_session_manager_->StartPreferenceHandler(); 187 arc_play_store_enabled_preference_handler_ =
188 base::MakeUnique<ArcPlayStoreEnabledPreferenceHandler>(
189 profile, arc_session_manager_.get());
190 arc_play_store_enabled_preference_handler_->Start();
187 } 191 }
188 192
189 void ArcServiceLauncher::Shutdown() { 193 void ArcServiceLauncher::Shutdown() {
190 DCHECK(arc_service_manager_);
191 // Destroy in the reverse order of the initialization. 194 // Destroy in the reverse order of the initialization.
192 arc_service_manager_->Shutdown(); 195 arc_play_store_enabled_preference_handler_.reset();
196 if (arc_service_manager_)
197 arc_service_manager_->Shutdown();
193 arc_session_manager_.reset(); 198 arc_session_manager_.reset();
194 arc_service_manager_.reset(); 199 arc_service_manager_.reset();
195 } 200 }
196 201
197 } // namespace arc 202 } // namespace arc
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_service_launcher.h ('k') | chrome/browser/chromeos/arc/arc_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698