Commit 75a477e7 authored by derat's avatar derat Committed by Commit bot

arc: Rename methods in ArcSessionManager::Observer.

Rename OnOptInEnabled to OnArcOptInChanged (to make it
clearer that it's also called on opt-out), and add "Arc" to
other method names as well to make their meaning clearer
when implemented by non-ARC-specific classes.

BUG=633243

Review-Url: https://codereview.chromium.org/2577103002
Cr-Commit-Position: refs/heads/master@{#438920}
parent e91cbbdc
...@@ -327,7 +327,7 @@ void ArcSessionManager::OnProvisioningFinished(ProvisioningResult result) { ...@@ -327,7 +327,7 @@ void ArcSessionManager::OnProvisioningFinished(ProvisioningResult result) {
} }
for (auto& observer : observer_list_) for (auto& observer : observer_list_)
observer.OnInitialStart(); observer.OnArcInitialStart();
return; return;
} }
...@@ -535,7 +535,7 @@ void ArcSessionManager::OnOptInPreferenceChanged() { ...@@ -535,7 +535,7 @@ void ArcSessionManager::OnOptInPreferenceChanged() {
const bool arc_enabled = IsArcEnabled(); const bool arc_enabled = IsArcEnabled();
for (auto& observer : observer_list_) for (auto& observer : observer_list_)
observer.OnOptInEnabled(arc_enabled); observer.OnArcOptInChanged(arc_enabled);
if (!arc_enabled) { if (!arc_enabled) {
// Reset any pending request to re-enable Arc. // Reset any pending request to re-enable Arc.
...@@ -622,7 +622,7 @@ void ArcSessionManager::ShutdownBridge() { ...@@ -622,7 +622,7 @@ void ArcSessionManager::ShutdownBridge() {
if (state_ != State::NOT_INITIALIZED && state_ != State::REMOVING_DATA_DIR) if (state_ != State::NOT_INITIALIZED && state_ != State::REMOVING_DATA_DIR)
SetState(State::STOPPED); SetState(State::STOPPED);
for (auto& observer : observer_list_) for (auto& observer : observer_list_)
observer.OnShutdownBridge(); observer.OnArcBridgeShutdown();
} }
void ArcSessionManager::AddObserver(Observer* observer) { void ArcSessionManager::AddObserver(Observer* observer) {
......
...@@ -104,13 +104,13 @@ class ArcSessionManager : public ArcService, ...@@ -104,13 +104,13 @@ class ArcSessionManager : public ArcService,
virtual ~Observer() = default; virtual ~Observer() = default;
// Called to notify that ARC bridge is shut down. // Called to notify that ARC bridge is shut down.
virtual void OnShutdownBridge() {} virtual void OnArcBridgeShutdown() {}
// Called to notify that ARC enabled state has been updated. // Called to notify that ARC enabled state has been updated.
virtual void OnOptInEnabled(bool enabled) {} virtual void OnArcOptInChanged(bool enabled) {}
// Called to notify that ARC has been initialized successfully. // Called to notify that ARC has been initialized successfully.
virtual void OnInitialStart() {} virtual void OnArcInitialStart() {}
// Called to notify that Android data has been removed. Used in // Called to notify that Android data has been removed. Used in
// browser_tests // browser_tests
......
...@@ -84,7 +84,7 @@ class ArcSessionManagerShutdownObserver : public ArcSessionManager::Observer { ...@@ -84,7 +84,7 @@ class ArcSessionManagerShutdownObserver : public ArcSessionManager::Observer {
} }
// ArcSessionManager::Observer: // ArcSessionManager::Observer:
void OnShutdownBridge() override { void OnArcBridgeShutdown() override {
if (!run_loop_) if (!run_loop_)
return; return;
run_loop_->Quit(); run_loop_->Quit();
......
...@@ -102,7 +102,7 @@ class ArcSettingsServiceImpl ...@@ -102,7 +102,7 @@ class ArcSettingsServiceImpl
bool powered) override; bool powered) override;
// ArcSessionManager::Observer: // ArcSessionManager::Observer:
void OnInitialStart() override; void OnArcInitialStart() override;
// NetworkStateHandlerObserver: // NetworkStateHandlerObserver:
void DefaultNetworkChanged(const chromeos::NetworkState* network) override; void DefaultNetworkChanged(const chromeos::NetworkState* network) override;
...@@ -224,7 +224,7 @@ void ArcSettingsServiceImpl::OnBluetoothAdapterInitialized( ...@@ -224,7 +224,7 @@ void ArcSettingsServiceImpl::OnBluetoothAdapterInitialized(
AdapterPoweredChanged(adapter.get(), adapter->IsPowered()); AdapterPoweredChanged(adapter.get(), adapter->IsPowered());
} }
void ArcSettingsServiceImpl::OnInitialStart() { void ArcSettingsServiceImpl::OnArcInitialStart() {
SyncInitialSettings(); SyncInitialSettings();
} }
......
...@@ -269,7 +269,7 @@ void ArcAppListPrefs::StartPrefs() { ...@@ -269,7 +269,7 @@ void ArcAppListPrefs::StartPrefs() {
if (arc_session_manager->state() != if (arc_session_manager->state() !=
arc::ArcSessionManager::State::NOT_INITIALIZED) arc::ArcSessionManager::State::NOT_INITIALIZED)
OnOptInEnabled(arc_session_manager->IsArcEnabled()); OnArcOptInChanged(arc_session_manager->IsArcEnabled());
arc_session_manager->AddObserver(this); arc_session_manager->AddObserver(this);
app_instance_holder_->AddObserver(this); app_instance_holder_->AddObserver(this);
...@@ -593,7 +593,7 @@ void ArcAppListPrefs::RemoveAllApps() { ...@@ -593,7 +593,7 @@ void ArcAppListPrefs::RemoveAllApps() {
DCHECK(ready_apps_.empty()); DCHECK(ready_apps_.empty());
} }
void ArcAppListPrefs::OnOptInEnabled(bool enabled) { void ArcAppListPrefs::OnArcOptInChanged(bool enabled) {
UpdateDefaultAppsHiddenState(); UpdateDefaultAppsHiddenState();
if (enabled) if (enabled)
......
...@@ -228,7 +228,7 @@ class ArcAppListPrefs ...@@ -228,7 +228,7 @@ class ArcAppListPrefs
bool HasObserver(Observer* observer); bool HasObserver(Observer* observer);
// arc::ArcSessionManager::Observer: // arc::ArcSessionManager::Observer:
void OnOptInEnabled(bool enabled) override; void OnArcOptInChanged(bool enabled) override;
// ArcDefaultAppList::Delegate: // ArcDefaultAppList::Delegate:
void OnDefaultAppsReady() override; void OnDefaultAppsReady() override;
......
...@@ -140,7 +140,7 @@ void ArcAppDeferredLauncherController::OnAppRemoved(const std::string& app_id) { ...@@ -140,7 +140,7 @@ void ArcAppDeferredLauncherController::OnAppRemoved(const std::string& app_id) {
Close(app_id); Close(app_id);
} }
void ArcAppDeferredLauncherController::OnOptInEnabled(bool enabled) { void ArcAppDeferredLauncherController::OnArcOptInChanged(bool enabled) {
if (enabled) if (enabled)
return; return;
......
...@@ -47,7 +47,7 @@ class ArcAppDeferredLauncherController ...@@ -47,7 +47,7 @@ class ArcAppDeferredLauncherController
void OnAppRemoved(const std::string& app_id) override; void OnAppRemoved(const std::string& app_id) override;
// arc::ArcSessionManager::Observer: // arc::ArcSessionManager::Observer:
void OnOptInEnabled(bool enabled) override; void OnArcOptInChanged(bool enabled) override;
// Removes entry from the list of tracking items. // Removes entry from the list of tracking items.
void Remove(const std::string& app_id); void Remove(const std::string& app_id);
......
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