Commit 00d8d63d authored by James Cook's avatar James Cook Committed by Commit Bot

chromeos: Clean up mash references in comments in //components/arc

Mustash/mash was shut down over a year ago. However, the checks for
ash::Shell::HasInstance() are still needed for tests.

Bug: none
Change-Id: I8164a5b36c1d77286e4a092c9a5f6c4cf33878f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2225377
Auto-Submit: James Cook <jamescook@chromium.org>
Commit-Queue: Yusuke Sato <yusukes@chromium.org>
Reviewed-by: default avatarYusuke Sato <yusukes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773962}
parent fb54c02a
...@@ -144,7 +144,6 @@ void ArcIntentHelperBridge::OnOpenDownloads() { ...@@ -144,7 +144,6 @@ void ArcIntentHelperBridge::OnOpenDownloads() {
// downloads by default, which is what we want. However if it is open it will // downloads by default, which is what we want. However if it is open it will
// simply be brought to the forgeground without forcibly being navigated to // simply be brought to the forgeground without forcibly being navigated to
// downloads, which is probably not ideal. // downloads, which is probably not ideal.
// TODO(mash): Support this functionality without ash::Shell access in Chrome.
ash::NewWindowDelegate::GetInstance()->OpenFileManager(); ash::NewWindowDelegate::GetInstance()->OpenFileManager();
} }
......
...@@ -151,7 +151,7 @@ void ArcPowerBridge::FlushWakeLocksForTesting() { ...@@ -151,7 +151,7 @@ void ArcPowerBridge::FlushWakeLocksForTesting() {
} }
void ArcPowerBridge::OnConnectionReady() { void ArcPowerBridge::OnConnectionReady() {
// TODO(mash): Support this functionality without ash::Shell access in Chrome. // ash::Shell may not exist in tests.
if (ash::Shell::HasInstance()) if (ash::Shell::HasInstance())
ash::Shell::Get()->display_configurator()->AddObserver(this); ash::Shell::Get()->display_configurator()->AddObserver(this);
chromeos::PowerManagerClient::Get()->AddObserver(this); chromeos::PowerManagerClient::Get()->AddObserver(this);
...@@ -161,7 +161,7 @@ void ArcPowerBridge::OnConnectionReady() { ...@@ -161,7 +161,7 @@ void ArcPowerBridge::OnConnectionReady() {
} }
void ArcPowerBridge::OnConnectionClosed() { void ArcPowerBridge::OnConnectionClosed() {
// TODO(mash): Support this functionality without ash::Shell access in Chrome. // ash::Shell may not exist in tests.
if (ash::Shell::HasInstance()) if (ash::Shell::HasInstance())
ash::Shell::Get()->display_configurator()->RemoveObserver(this); ash::Shell::Get()->display_configurator()->RemoveObserver(this);
chromeos::PowerManagerClient::Get()->RemoveObserver(this); chromeos::PowerManagerClient::Get()->RemoveObserver(this);
......
...@@ -47,7 +47,7 @@ ArcRotationLockBridge::ArcRotationLockBridge(content::BrowserContext* context, ...@@ -47,7 +47,7 @@ ArcRotationLockBridge::ArcRotationLockBridge(content::BrowserContext* context,
ArcBridgeService* bridge_service) ArcBridgeService* bridge_service)
: arc_bridge_service_(bridge_service) { : arc_bridge_service_(bridge_service) {
arc_bridge_service_->rotation_lock()->AddObserver(this); arc_bridge_service_->rotation_lock()->AddObserver(this);
// TODO(mash): Support this functionality without ash::Shell access in Chrome. // ash::Shell may not exist in tests.
if (ash::Shell::HasInstance()) { if (ash::Shell::HasInstance()) {
ash::Shell::Get()->screen_orientation_controller()->AddObserver(this); ash::Shell::Get()->screen_orientation_controller()->AddObserver(this);
ash::Shell::Get()->tablet_mode_controller()->AddObserver(this); ash::Shell::Get()->tablet_mode_controller()->AddObserver(this);
...@@ -56,8 +56,7 @@ ArcRotationLockBridge::ArcRotationLockBridge(content::BrowserContext* context, ...@@ -56,8 +56,7 @@ ArcRotationLockBridge::ArcRotationLockBridge(content::BrowserContext* context,
ArcRotationLockBridge::~ArcRotationLockBridge() { ArcRotationLockBridge::~ArcRotationLockBridge() {
arc_bridge_service_->rotation_lock()->RemoveObserver(this); arc_bridge_service_->rotation_lock()->RemoveObserver(this);
// TODO(mus): mus needs proper shutdown process. // ash::Shell may not exist in tests.
// TODO(mash): Support this functionality without ash::Shell access in Chrome.
if (ash::Shell::HasInstance()) { if (ash::Shell::HasInstance()) {
ash::Shell::Get()->screen_orientation_controller()->RemoveObserver(this); ash::Shell::Get()->screen_orientation_controller()->RemoveObserver(this);
ash::Shell::Get()->tablet_mode_controller()->RemoveObserver(this); ash::Shell::Get()->tablet_mode_controller()->RemoveObserver(this);
...@@ -77,7 +76,7 @@ void ArcRotationLockBridge::OnTabletPhysicalStateChanged() { ...@@ -77,7 +76,7 @@ void ArcRotationLockBridge::OnTabletPhysicalStateChanged() {
} }
void ArcRotationLockBridge::SendRotationLockState() { void ArcRotationLockBridge::SendRotationLockState() {
// TODO(mash): Support this functionality without ash::Shell access in Chrome. // ash::Shell may not exist in tests.
if (!ash::Shell::HasInstance()) if (!ash::Shell::HasInstance())
return; return;
......
...@@ -375,7 +375,7 @@ void ArcSessionImpl::DoStartMiniInstance(size_t num_cores_disabled) { ...@@ -375,7 +375,7 @@ void ArcSessionImpl::DoStartMiniInstance(size_t num_cores_disabled) {
base::FeatureList::IsEnabled(arc::kNativeBridgeToggleFeature); base::FeatureList::IsEnabled(arc::kNativeBridgeToggleFeature);
params.arc_file_picker_experiment = params.arc_file_picker_experiment =
base::FeatureList::IsEnabled(arc::kFilePickerExperimentFeature); base::FeatureList::IsEnabled(arc::kFilePickerExperimentFeature);
// Enable Custom Tabs only on Dev and Cannary, and only when Mash is enabled. // Enable Custom Tabs only on Dev and Canary.
const bool is_custom_tab_enabled = const bool is_custom_tab_enabled =
base::FeatureList::IsEnabled(arc::kCustomTabsExperimentFeature) && base::FeatureList::IsEnabled(arc::kCustomTabsExperimentFeature) &&
delegate_->GetChannel() != version_info::Channel::STABLE && delegate_->GetChannel() != version_info::Channel::STABLE &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment