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

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

Issue 2559663002: Support focus highlight in Android window (Closed)
Patch Set: Created 4 years 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/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h" 21 #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h"
22 #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h" 22 #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h"
23 #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h" 23 #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h"
24 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 24 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
25 #include "components/arc/arc_service_manager.h" 25 #include "components/arc/arc_service_manager.h"
26 #include "components/arc/audio/arc_audio_bridge.h" 26 #include "components/arc/audio/arc_audio_bridge.h"
27 #include "components/arc/bluetooth/arc_bluetooth_bridge.h" 27 #include "components/arc/bluetooth/arc_bluetooth_bridge.h"
28 #include "components/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h" 28 #include "components/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h"
29 #include "components/arc/clipboard/arc_clipboard_bridge.h" 29 #include "components/arc/clipboard/arc_clipboard_bridge.h"
30 #include "components/arc/crash_collector/arc_crash_collector_bridge.h" 30 #include "components/arc/crash_collector/arc_crash_collector_bridge.h"
31 #include "components/arc/focus_highlight/arc_focus_highlight_bridge.h"
31 #include "components/arc/ime/arc_ime_service.h" 32 #include "components/arc/ime/arc_ime_service.h"
32 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" 33 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
33 #include "components/arc/kiosk/arc_kiosk_bridge.h" 34 #include "components/arc/kiosk/arc_kiosk_bridge.h"
34 #include "components/arc/metrics/arc_metrics_service.h" 35 #include "components/arc/metrics/arc_metrics_service.h"
35 #include "components/arc/net/arc_net_host_impl.h" 36 #include "components/arc/net/arc_net_host_impl.h"
36 #include "components/arc/obb_mounter/arc_obb_mounter_bridge.h" 37 #include "components/arc/obb_mounter/arc_obb_mounter_bridge.h"
37 #include "components/arc/power/arc_power_bridge.h" 38 #include "components/arc/power/arc_power_bridge.h"
38 #include "components/arc/storage_manager/arc_storage_manager.h" 39 #include "components/arc/storage_manager/arc_storage_manager.h"
39 #include "components/arc/user_data/arc_user_data_service.h" 40 #include "components/arc/user_data/arc_user_data_service.h"
40 #include "components/prefs/pref_member.h" 41 #include "components/prefs/pref_member.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 arc_service_manager_->AddService( 93 arc_service_manager_->AddService(
93 base::MakeUnique<ArcClipboardBridge>(arc_bridge_service)); 94 base::MakeUnique<ArcClipboardBridge>(arc_bridge_service));
94 arc_service_manager_->AddService( 95 arc_service_manager_->AddService(
95 base::MakeUnique<ArcContentFileSystemService>(arc_bridge_service)); 96 base::MakeUnique<ArcContentFileSystemService>(arc_bridge_service));
96 arc_service_manager_->AddService(base::MakeUnique<ArcCrashCollectorBridge>( 97 arc_service_manager_->AddService(base::MakeUnique<ArcCrashCollectorBridge>(
97 arc_bridge_service, arc_service_manager_->blocking_task_runner())); 98 arc_bridge_service, arc_service_manager_->blocking_task_runner()));
98 arc_service_manager_->AddService( 99 arc_service_manager_->AddService(
99 base::MakeUnique<ArcDownloadsWatcherService>(arc_bridge_service)); 100 base::MakeUnique<ArcDownloadsWatcherService>(arc_bridge_service));
100 arc_service_manager_->AddService( 101 arc_service_manager_->AddService(
101 base::MakeUnique<ArcEnterpriseReportingService>(arc_bridge_service)); 102 base::MakeUnique<ArcEnterpriseReportingService>(arc_bridge_service));
103 arc_service_manager_->AddService(
104 base::MakeUnique<ArcFocusHighlightBridge>(arc_bridge_service));
102 auto intent_helper = base::MakeUnique<ArcIntentHelperBridge>( 105 auto intent_helper = base::MakeUnique<ArcIntentHelperBridge>(
103 arc_bridge_service, arc_service_manager_->icon_loader(), 106 arc_bridge_service, arc_service_manager_->icon_loader(),
104 arc_service_manager_->activity_resolver()); 107 arc_service_manager_->activity_resolver());
105 // We don't have to remove observer since 108 // We don't have to remove observer since
106 // ArcServiceManager always outlives ArcIntentHelperBridge. 109 // ArcServiceManager always outlives ArcIntentHelperBridge.
107 intent_helper->AddObserver(arc_service_manager_.get()); 110 intent_helper->AddObserver(arc_service_manager_.get());
108 arc_service_manager_->AddService(std::move(intent_helper)); 111 arc_service_manager_->AddService(std::move(intent_helper));
109 arc_service_manager_->AddService( 112 arc_service_manager_->AddService(
110 base::MakeUnique<ArcImeService>(arc_bridge_service)); 113 base::MakeUnique<ArcImeService>(arc_bridge_service));
111 arc_service_manager_->AddService( 114 arc_service_manager_->AddService(
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 149
147 void ArcServiceLauncher::Shutdown() { 150 void ArcServiceLauncher::Shutdown() {
148 DCHECK(arc_service_manager_); 151 DCHECK(arc_service_manager_);
149 // Destroy in the reverse order of the initialization. 152 // Destroy in the reverse order of the initialization.
150 arc_service_manager_->Shutdown(); 153 arc_service_manager_->Shutdown();
151 arc_session_manager_.reset(); 154 arc_session_manager_.reset();
152 arc_service_manager_.reset(); 155 arc_service_manager_.reset();
153 } 156 }
154 157
155 } // namespace arc 158 } // namespace arc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698