Index: components/arc/window_manager/arc_window_manager_bridge.cc |
diff --git a/components/arc/window_manager/arc_window_manager_bridge.cc b/components/arc/window_manager/arc_window_manager_bridge.cc |
index 45b96861250e25f61ddd674d000ad9736475e894..ab0e5b5c4c902787e6843c4ff5607e1fd6bf41c3 100644 |
--- a/components/arc/window_manager/arc_window_manager_bridge.cc |
+++ b/components/arc/window_manager/arc_window_manager_bridge.cc |
@@ -14,7 +14,7 @@ namespace arc { |
ArcWindowManagerBridge::ArcWindowManagerBridge(ArcBridgeService* bridge_service) |
: ArcService(bridge_service), |
current_mode_(mojom::WindowManagerMode::MODE_NORMAL) { |
- arc_bridge_service()->AddObserver(this); |
+ arc_bridge_service()->window_manager()->AddObserver(this); |
if (!ash::WmShell::HasInstance()) { |
// The shell gets always loaded before ARC. If there is no shell it can only |
// mean that a unit test is running. |
@@ -24,7 +24,8 @@ ArcWindowManagerBridge::ArcWindowManagerBridge(ArcBridgeService* bridge_service) |
ash::WmShell::Get()->AddShellObserver(this); |
} |
-void ArcWindowManagerBridge::OnWindowManagerInstanceReady() { |
+void ArcWindowManagerBridge::OnInstanceReady(mojom::WindowManagerInstance*, |
+ uint32_t version) { |
if (!ash::WmShell::HasInstance()) { |
// The shell gets always loaded before ARC. If there is no shell it can only |
// mean that a unit test is running. |
@@ -42,7 +43,7 @@ void ArcWindowManagerBridge::OnWindowManagerInstanceReady() { |
ArcWindowManagerBridge::~ArcWindowManagerBridge() { |
if (ash::WmShell::HasInstance()) |
ash::WmShell::Get()->RemoveShellObserver(this); |
- arc_bridge_service()->RemoveObserver(this); |
+ arc_bridge_service()->window_manager()->RemoveObserver(this); |
} |
void ArcWindowManagerBridge::OnMaximizeModeStarted() { |
@@ -57,12 +58,12 @@ void ArcWindowManagerBridge::SendWindowManagerModeChange( |
bool touch_view_enabled) { |
// We let the ArcBridgeService check that we are calling on the right thread. |
DCHECK(ArcBridgeService::Get() != nullptr); |
- mojom::WindowManagerMode wm_mode = touch_view_enabled ? |
- mojom::WindowManagerMode::MODE_TOUCH_VIEW : |
- mojom::WindowManagerMode::MODE_NORMAL; |
+ mojom::WindowManagerMode wm_mode = |
+ touch_view_enabled ? mojom::WindowManagerMode::MODE_TOUCH_VIEW |
+ : mojom::WindowManagerMode::MODE_NORMAL; |
mojom::WindowManagerInstance* wm_instance = |
- arc_bridge_service()->window_manager_instance(); |
+ arc_bridge_service()->window_manager()->instance(); |
if (!wm_instance || wm_mode == current_mode_) { |
return; |
} |