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 "components/arc/intent_helper/arc_intent_helper_bridge.h" | 5 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/common/new_window_delegate.h" | 10 #include "ash/common/new_window_delegate.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 | 24 |
25 namespace { | 25 namespace { |
26 | 26 |
27 constexpr char kArcIntentHelperPackageName[] = "org.chromium.arc.intent_helper"; | 27 constexpr char kArcIntentHelperPackageName[] = "org.chromium.arc.intent_helper"; |
28 | 28 |
29 } // namespace | 29 } // namespace |
30 | 30 |
31 ArcIntentHelperBridge::ArcIntentHelperBridge( | 31 ArcIntentHelperBridge::ArcIntentHelperBridge( |
32 ArcBridgeService* bridge_service, | 32 ArcBridgeService* bridge_service, |
33 const scoped_refptr<ActivityIconLoader>& icon_loader, | 33 const scoped_refptr<ActivityIconLoader>& icon_loader, |
34 std::unique_ptr<SetWallpaperDelegate> set_wallpaper_delegate, | 34 SetWallpaperDelegate* set_wallpaper_delegate, |
35 const scoped_refptr<LocalActivityResolver>& activity_resolver) | 35 const scoped_refptr<LocalActivityResolver>& activity_resolver) |
36 : ArcService(bridge_service), | 36 : ArcService(bridge_service), |
37 binding_(this), | 37 binding_(this), |
38 icon_loader_(icon_loader), | 38 icon_loader_(icon_loader), |
39 set_wallpaper_delegate_(std::move(set_wallpaper_delegate)), | 39 set_wallpaper_delegate_(set_wallpaper_delegate), |
40 activity_resolver_(activity_resolver) { | 40 activity_resolver_(activity_resolver) { |
41 DCHECK(thread_checker_.CalledOnValidThread()); | 41 DCHECK(thread_checker_.CalledOnValidThread()); |
42 arc_bridge_service()->intent_helper()->AddObserver(this); | 42 arc_bridge_service()->intent_helper()->AddObserver(this); |
43 } | 43 } |
44 | 44 |
45 ArcIntentHelperBridge::~ArcIntentHelperBridge() { | 45 ArcIntentHelperBridge::~ArcIntentHelperBridge() { |
46 DCHECK(thread_checker_.CalledOnValidThread()); | 46 DCHECK(thread_checker_.CalledOnValidThread()); |
47 arc_bridge_service()->intent_helper()->RemoveObserver(this); | 47 arc_bridge_service()->intent_helper()->RemoveObserver(this); |
48 } | 48 } |
49 | 49 |
(...skipping 30 matching lines...) Expand all Loading... |
80 ash::WmShell::Get()->delegate()->OpenUrlFromArc(gurl); | 80 ash::WmShell::Get()->delegate()->OpenUrlFromArc(gurl); |
81 } | 81 } |
82 | 82 |
83 void ArcIntentHelperBridge::OpenWallpaperPicker() { | 83 void ArcIntentHelperBridge::OpenWallpaperPicker() { |
84 DCHECK(thread_checker_.CalledOnValidThread()); | 84 DCHECK(thread_checker_.CalledOnValidThread()); |
85 ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage(); | 85 ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage(); |
86 } | 86 } |
87 | 87 |
88 void ArcIntentHelperBridge::SetWallpaper(mojo::Array<uint8_t> jpeg_data) { | 88 void ArcIntentHelperBridge::SetWallpaper(mojo::Array<uint8_t> jpeg_data) { |
89 DCHECK(thread_checker_.CalledOnValidThread()); | 89 DCHECK(thread_checker_.CalledOnValidThread()); |
90 set_wallpaper_delegate_->SetWallpaper(jpeg_data.PassStorage()); | 90 set_wallpaper_delegate_->SetWallpaperJPEG(jpeg_data.PassStorage()); |
91 } | 91 } |
92 | 92 |
93 std::unique_ptr<ash::LinkHandlerModel> ArcIntentHelperBridge::CreateModel( | 93 std::unique_ptr<ash::LinkHandlerModel> ArcIntentHelperBridge::CreateModel( |
94 const GURL& url) { | 94 const GURL& url) { |
95 DCHECK(thread_checker_.CalledOnValidThread()); | 95 DCHECK(thread_checker_.CalledOnValidThread()); |
96 std::unique_ptr<LinkHandlerModelImpl> impl( | 96 std::unique_ptr<LinkHandlerModelImpl> impl( |
97 new LinkHandlerModelImpl(icon_loader_)); | 97 new LinkHandlerModelImpl(icon_loader_)); |
98 if (!impl->Init(url)) | 98 if (!impl->Init(url)) |
99 return nullptr; | 99 return nullptr; |
100 return std::move(impl); | 100 return std::move(impl); |
(...skipping 18 matching lines...) Expand all Loading... |
119 return handlers_filtered; | 119 return handlers_filtered; |
120 } | 120 } |
121 | 121 |
122 void ArcIntentHelperBridge::OnIntentFiltersUpdated( | 122 void ArcIntentHelperBridge::OnIntentFiltersUpdated( |
123 mojo::Array<mojom::IntentFilterPtr> filters) { | 123 mojo::Array<mojom::IntentFilterPtr> filters) { |
124 DCHECK(thread_checker_.CalledOnValidThread()); | 124 DCHECK(thread_checker_.CalledOnValidThread()); |
125 activity_resolver_->UpdateIntentFilters(std::move(filters)); | 125 activity_resolver_->UpdateIntentFilters(std::move(filters)); |
126 } | 126 } |
127 | 127 |
128 } // namespace arc | 128 } // namespace arc |
OLD | NEW |