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

Unified Diff: components/arc/window_manager/arc_window_manager_bridge.cc

Issue 2133503002: arc: Revamp the ArcBridgeService interface (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: More rebasing Created 4 years, 5 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
« no previous file with comments | « components/arc/window_manager/arc_window_manager_bridge.h ('k') | ui/arc/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..ee2e28b5585ee1689b95c806fd705166ac3aa45a 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,7 @@ ArcWindowManagerBridge::ArcWindowManagerBridge(ArcBridgeService* bridge_service)
ash::WmShell::Get()->AddShellObserver(this);
}
-void ArcWindowManagerBridge::OnWindowManagerInstanceReady() {
+void ArcWindowManagerBridge::OnInstanceReady() {
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 +42,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 +57,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;
}
« no previous file with comments | « components/arc/window_manager/arc_window_manager_bridge.h ('k') | ui/arc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698