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

Side by Side Diff: components/arc/intent_helper/arc_intent_helper_bridge.cc

Issue 2443313002: Add more tests to arc_navigation_throttle.cc (Closed)
Patch Set: address comments Created 4 years, 1 month 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 "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"
11 #include "ash/common/shell_delegate.h" 11 #include "ash/common/shell_delegate.h"
12 #include "ash/common/wallpaper/wallpaper_controller.h" 12 #include "ash/common/wallpaper/wallpaper_controller.h"
13 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
14 #include "ash/shell.h" 14 #include "ash/shell.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "components/arc/arc_bridge_service.h" 17 #include "components/arc/arc_bridge_service.h"
18 #include "components/arc/intent_helper/activity_icon_loader.h" 18 #include "components/arc/intent_helper/activity_icon_loader.h"
19 #include "components/arc/intent_helper/link_handler_model_impl.h" 19 #include "components/arc/intent_helper/link_handler_model_impl.h"
20 #include "components/arc/intent_helper/local_activity_resolver.h" 20 #include "components/arc/intent_helper/local_activity_resolver.h"
21 #include "ui/base/layout.h" 21 #include "ui/base/layout.h"
22 #include "url/gurl.h" 22 #include "url/gurl.h"
23 23
24 namespace arc { 24 namespace arc {
25 25
26 namespace { 26 // static
27 27 const char ArcIntentHelperBridge::kArcIntentHelperPackageName[] =
28 constexpr char kArcIntentHelperPackageName[] = "org.chromium.arc.intent_helper"; 28 "org.chromium.arc.intent_helper";
29
30 } // namespace
31 29
32 ArcIntentHelperBridge::ArcIntentHelperBridge( 30 ArcIntentHelperBridge::ArcIntentHelperBridge(
33 ArcBridgeService* bridge_service, 31 ArcBridgeService* bridge_service,
34 const scoped_refptr<ActivityIconLoader>& icon_loader, 32 const scoped_refptr<ActivityIconLoader>& icon_loader,
35 const scoped_refptr<LocalActivityResolver>& activity_resolver) 33 const scoped_refptr<LocalActivityResolver>& activity_resolver)
36 : ArcService(bridge_service), 34 : ArcService(bridge_service),
37 binding_(this), 35 binding_(this),
38 icon_loader_(icon_loader), 36 icon_loader_(icon_loader),
39 activity_resolver_(activity_resolver) { 37 activity_resolver_(activity_resolver) {
40 DCHECK(thread_checker_.CalledOnValidThread()); 38 DCHECK(thread_checker_.CalledOnValidThread());
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 min_instance_version, nullptr); 164 min_instance_version, nullptr);
167 } 165 }
168 166
169 void ArcIntentHelperBridge::OnIntentFiltersUpdated( 167 void ArcIntentHelperBridge::OnIntentFiltersUpdated(
170 mojo::Array<mojom::IntentFilterPtr> filters) { 168 mojo::Array<mojom::IntentFilterPtr> filters) {
171 DCHECK(thread_checker_.CalledOnValidThread()); 169 DCHECK(thread_checker_.CalledOnValidThread());
172 activity_resolver_->UpdateIntentFilters(std::move(filters)); 170 activity_resolver_->UpdateIntentFilters(std::move(filters));
173 } 171 }
174 172
175 } // namespace arc 173 } // namespace arc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698