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

Unified Diff: components/arc/power/arc_power_bridge.cc

Issue 2357053002: Always use arc::InstanceHolder<T>::GetInstanceForMethod (Closed)
Patch Set: rebased to catch up tot Created 4 years, 3 months 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 side-by-side diff with in-line comments
Download patch
Index: components/arc/power/arc_power_bridge.cc
diff --git a/components/arc/power/arc_power_bridge.cc b/components/arc/power/arc_power_bridge.cc
index fb8b1fdc7b0adfa8f37d807f9e71be051217d20b..df707be96965b61b7c08c38d206c18aa7eb029fe 100644
--- a/components/arc/power/arc_power_bridge.cc
+++ b/components/arc/power/arc_power_bridge.cc
@@ -14,6 +14,12 @@
namespace arc {
+namespace {
+
+constexpr uint32_t kMinVersionForSetInteractive = 1;
+
+} // namespace
+
ArcPowerBridge::ArcPowerBridge(ArcBridgeService* bridge_service)
: ArcService(bridge_service), binding_(this) {
arc_bridge_service()->power()->AddObserver(this);
@@ -26,12 +32,8 @@ ArcPowerBridge::~ArcPowerBridge() {
void ArcPowerBridge::OnInstanceReady() {
mojom::PowerInstance* power_instance =
- arc_bridge_service()->power()->instance();
- if (!power_instance) {
- LOG(ERROR) << "OnPowerInstanceReady called, but no power instance found";
- return;
- }
-
+ arc_bridge_service()->power()->GetInstanceForMethod("Init");
+ CHECK(power_instance);
power_instance->Init(binding_.CreateInterfacePtrAndBind());
ash::Shell::GetInstance()->display_configurator()->AddObserver(this);
}
@@ -44,11 +46,10 @@ void ArcPowerBridge::OnInstanceClosed() {
void ArcPowerBridge::OnPowerStateChanged(
chromeos::DisplayPowerState power_state) {
mojom::PowerInstance* power_instance =
- arc_bridge_service()->power()->instance();
- if (!power_instance) {
- LOG(ERROR) << "PowerInstance is not available";
+ arc_bridge_service()->power()->GetInstanceForMethod(
+ "SetInteractive", kMinVersionForSetInteractive);
+ if (!power_instance)
return;
- }
bool enabled = (power_state != chromeos::DISPLAY_POWER_ALL_OFF);
power_instance->SetInteractive(enabled);

Powered by Google App Engine
This is Rietveld 408576698