Skip to content

Commit

Permalink
Remove PreferredApp related mojom implementation.
Browse files Browse the repository at this point in the history 
This CL is used to prepare for CL:3932640 to remove the
kAppServicePreferredAppsWithoutMojom flag.

BUG=1253250

Change-Id: I19982dcafc0f3902508df6330c6bf6126fa9ead2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3934662
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Maggie Cai <mxcai@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1055156}
  • Loading branch information
Nancy Wang authored and Chromium LUCI CQ committed Oct 5, 2022
1 parent b35573b commit aa7a891
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 125 deletions.
75 changes: 2 additions & 73 deletions components/services/app_service/app_service_mojom_impl.cc
View file
Expand Up @@ -31,13 +31,7 @@ namespace apps {
AppServiceMojomImpl::AppServiceMojomImpl(
const base::FilePath& profile_dir,
base::OnceClosure read_completed_for_testing,
base::OnceClosure write_completed_for_testing) {
if (!base::FeatureList::IsEnabled(kAppServicePreferredAppsWithoutMojom)) {
preferred_apps_impl_ = std::make_unique<PreferredAppsImpl>(
this, profile_dir, std::move(read_completed_for_testing),
std::move(write_completed_for_testing));
}
}
base::OnceClosure write_completed_for_testing) {}

AppServiceMojomImpl::~AppServiceMojomImpl() = default;

Expand Down Expand Up @@ -81,16 +75,6 @@ void AppServiceMojomImpl::RegisterSubscriber(
::Connect(iter.second.get(), subscriber.get());
}

// TODO: store the opts somewhere.

// Initialise the Preferred Apps in the Subscribers on register.
if (preferred_apps_impl_ &&
preferred_apps_impl_->preferred_apps_list_.IsInitialized()) {
subscriber->InitializePreferredApps(
ConvertPreferredAppsToMojomPreferredApps(
preferred_apps_impl_->preferred_apps_list_.GetValue()));
}

// Add the new subscriber to the set.
subscribers_.Add(std::move(subscriber));
}
Expand Down Expand Up @@ -230,47 +214,6 @@ void AppServiceMojomImpl::OpenNativeSettings(apps::mojom::AppType app_type,
iter->second->OpenNativeSettings(app_id);
}

void AppServiceMojomImpl::AddPreferredApp(
apps::mojom::AppType app_type,
const std::string& app_id,
apps::mojom::IntentFilterPtr intent_filter,
apps::mojom::IntentPtr intent,
bool from_publisher) {
if (preferred_apps_impl_) {
preferred_apps_impl_->AddPreferredApp(
ConvertMojomAppTypToAppType(app_type), app_id,
ConvertMojomIntentFilterToIntentFilter(intent_filter),
ConvertMojomIntentToIntent(intent), from_publisher);
}
}

void AppServiceMojomImpl::RemovePreferredApp(apps::mojom::AppType app_type,
const std::string& app_id) {
if (preferred_apps_impl_) {
preferred_apps_impl_->RemovePreferredApp(app_id);
}
}

void AppServiceMojomImpl::SetSupportedLinksPreference(
apps::mojom::AppType app_type,
const std::string& app_id,
std::vector<apps::mojom::IntentFilterPtr> all_link_filters) {
if (preferred_apps_impl_) {
preferred_apps_impl_->SetSupportedLinksPreference(
ConvertMojomAppTypToAppType(app_type), app_id,
ConvertMojomIntentFiltersToIntentFilters(all_link_filters));
}
}

void AppServiceMojomImpl::RemoveSupportedLinksPreference(
apps::mojom::AppType app_type,
const std::string& app_id) {
if (preferred_apps_impl_) {
preferred_apps_impl_->RemoveSupportedLinksPreference(
ConvertMojomAppTypToAppType(app_type), app_id);
}
}

void AppServiceMojomImpl::SetResizeLocked(apps::mojom::AppType app_type,
const std::string& app_id,
mojom::OptionalBool locked) {
Expand Down Expand Up @@ -302,17 +245,7 @@ void AppServiceMojomImpl::SetRunOnOsLoginMode(
iter->second->SetRunOnOsLoginMode(app_id, run_on_os_login_mode);
}

void AppServiceMojomImpl::InitializePreferredAppsForAllSubscribers() {
if (!preferred_apps_impl_) {
return;
}

for (auto& subscriber : subscribers_) {
subscriber->InitializePreferredApps(
ConvertPreferredAppsToMojomPreferredApps(
preferred_apps_impl_->preferred_apps_list_.GetValue()));
}
}
void AppServiceMojomImpl::InitializePreferredAppsForAllSubscribers() {}

void AppServiceMojomImpl::OnPreferredAppsChanged(
PreferredAppChangesPtr changes) {
Expand Down Expand Up @@ -356,10 +289,6 @@ bool AppServiceMojomImpl::HasPublisher(AppType app_type) {
return base::Contains(publishers_, ConvertAppTypeToMojomAppType(app_type));
}

PreferredAppsList& AppServiceMojomImpl::GetPreferredAppsListForTesting() {
return preferred_apps_impl_->preferred_apps_list_;
}

void AppServiceMojomImpl::OnPublisherDisconnected(
apps::mojom::AppType app_type) {
publishers_.erase(app_type);
Expand Down
20 changes: 0 additions & 20 deletions components/services/app_service/app_service_mojom_impl.h
View file
Expand Up @@ -23,8 +23,6 @@

namespace apps {

class PreferredAppsList;

// The implementation of the apps::mojom::AppService Mojo interface.
//
// See components/services/app_service/README.md.
Expand Down Expand Up @@ -95,19 +93,6 @@ class AppServiceMojomImpl : public apps::mojom::AppService,
int64_t display_id) override;
void OpenNativeSettings(apps::mojom::AppType app_type,
const std::string& app_id) override;
void AddPreferredApp(apps::mojom::AppType app_type,
const std::string& app_id,
apps::mojom::IntentFilterPtr intent_filter,
apps::mojom::IntentPtr intent,
bool from_publisher) override;
void RemovePreferredApp(apps::mojom::AppType app_type,
const std::string& app_id) override;
void SetSupportedLinksPreference(
apps::mojom::AppType app_type,
const std::string& app_id,
std::vector<apps::mojom::IntentFilterPtr> all_link_filters) override;
void RemoveSupportedLinksPreference(apps::mojom::AppType app_type,
const std::string& app_id) override;
void SetResizeLocked(apps::mojom::AppType app_type,
const std::string& app_id,
apps::mojom::OptionalBool locked) override;
Expand Down Expand Up @@ -141,9 +126,6 @@ class AppServiceMojomImpl : public apps::mojom::AppService,
// false.
bool HasPublisher(AppType app_type) override;

// Retern the preferred_apps_list_ for testing.
PreferredAppsList& GetPreferredAppsListForTesting();

private:
void OnPublisherDisconnected(apps::mojom::AppType app_type);

Expand All @@ -156,8 +138,6 @@ class AppServiceMojomImpl : public apps::mojom::AppService,
// Must come after the publisher and subscriber maps to ensure it is
// destroyed first, closing the connection to avoid dangling callbacks.
mojo::ReceiverSet<apps::mojom::AppService> receivers_;

std::unique_ptr<PreferredAppsImpl> preferred_apps_impl_;
};

} // namespace apps
Expand Down
32 changes: 0 additions & 32 deletions components/services/app_service/public/mojom/app_service.mojom
View file
Expand Up @@ -110,38 +110,6 @@ interface AppService {
AppType app_type,
string app_id);

// Sets app identified by |app_id| as preferred app for |intent_filter|.
// |intent| is needed to set the preferred app in ARC.
// If the request is |from_publisher|, we would not sync the preferred
// app back to the publisher.
AddPreferredApp(
AppType app_type,
string app_id,
IntentFilter intent_filter,
Intent? intent,
bool from_publisher);

// Removes all preferred app setting for an |app_id|.
RemovePreferredApp(AppType app_type, string app_id);

// Set |app_id| as preferred app for all its supported link filters. Supported
// link filters, which have the http/https scheme and at least one host, are
// always enabled/disabled as a group. |all_link_filters| should contain all
// of the apps' Supported Link intent filters.
// Any apps with overlapping preferred app preferences will have all their
// supported link filters unset, as if RemoveSupportedLinksPreference was
// called for that app.
SetSupportedLinksPreference(
AppType app_type,
string app_id,
array<IntentFilter> all_link_filters);

// Removes all supported link filters from the preferred app list for an
// |app_id|.
RemoveSupportedLinksPreference(
AppType app_type,
string app_id);

// Enables resize lock mode for the app identified by |app_id| with the given
// |app_type|.
SetResizeLocked(
Expand Down

0 comments on commit aa7a891

Please sign in to comment.