Skip to content

Commit

Permalink
Split AppServiceProxy for Chrome OS and Chrome browser.
Browse files Browse the repository at this point in the history
This CL splits AppServiceProxy into:
AppServiceProxyBase:     parent class for AppServiceProxy*.
AppServiceProxyChromeOs: for Chrome OS.
AppServiceProxy:         for Chrome browser.

This is the preparing to extend AppServiceProxy to run in Lacros.
Because there are too many macros in AppServiceProxy, so split it into
subclasses.

BUG=1016159

Change-Id: I389c58db639145607d6d0b5394abcb140c6500f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2789213
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: Anqing Zhao <anqing@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#867982}
  • Loading branch information
Nancy Wang authored and Chromium LUCI CQ committed Mar 31, 2021
1 parent bb84d0d commit cdf554e
Show file tree
Hide file tree
Showing 100 changed files with 1,982 additions and 1,816 deletions.
7 changes: 6 additions & 1 deletion chrome/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3389,8 +3389,11 @@ static_library("browser") {
"apps/app_service/app_launch_params.h",
"apps/app_service/app_service_metrics.cc",
"apps/app_service/app_service_metrics.h",
"apps/app_service/app_service_proxy.cc",
"apps/app_service/app_service_proxy.h",
"apps/app_service/app_service_proxy_base.cc",
"apps/app_service/app_service_proxy_base.h",
"apps/app_service/app_service_proxy_desktop.cc",
"apps/app_service/app_service_proxy_desktop.h",
"apps/app_service/app_service_proxy_factory.cc",
"apps/app_service/app_service_proxy_factory.h",
"apps/app_service/browser_app_launcher.cc",
Expand Down Expand Up @@ -4276,6 +4279,8 @@ static_library("browser") {
sources += [
"apps/app_service/app_notifications.cc",
"apps/app_service/app_notifications.h",
"apps/app_service/app_service_proxy_chromeos.cc",
"apps/app_service/app_service_proxy_chromeos.h",
"apps/app_service/app_shortcut_item.cc",
"apps/app_service/app_shortcut_item.h",
"apps/app_service/app_web_contents_data.cc",
Expand Down
7 changes: 1 addition & 6 deletions chrome/browser/apps/app_service/DEPS
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
include_rules = [
"+components/services/app_service/app_service_impl.h",
"+components/services/app_service/public",
"+components/full_restore",
]

specific_include_rules = {
"app_service_proxy\.cc": [
# App Service Proxy hosts the actual Mojo App Service as a private
# implementation detail. Allow the impl to be included there, but don't
# expose it to any other files except through the public mojo interface.
"+components/services/app_service/app_service_impl.h",
],
"notifications_browsertest\.cc": [
"+ash/system/message_center/arc/arc_notification_manager.h",
"+ash/system/message_center/arc/arc_notification_manager_delegate.h",
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/apps/app_service/app_icon_source.cc
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void AppIconSource::StartDataRequest(
return;
}

apps::AppServiceProxy* app_service_proxy =
auto* app_service_proxy =
apps::AppServiceProxyFactory::GetForProfile(profile_);

const apps::mojom::AppType app_type =
Expand Down

0 comments on commit cdf554e

Please sign in to comment.