Index: chrome/browser/ui/views/frame/immersive_context_mus.cc |
diff --git a/chrome/browser/ui/views/frame/immersive_context_mus.cc b/chrome/browser/ui/views/frame/immersive_context_mus.cc |
index 7a9e9551ef7d830ee6f2cb89fdb574b5f59252d7..78126688d306c84c22320b4962e06446efb76072 100644 |
--- a/chrome/browser/ui/views/frame/immersive_context_mus.cc |
+++ b/chrome/browser/ui/views/frame/immersive_context_mus.cc |
@@ -4,12 +4,14 @@ |
#include "chrome/browser/ui/views/frame/immersive_context_mus.h" |
-#include "services/ui/public/cpp/window_tree_client.h" |
-#include "ui/views/mus/pointer_watcher_event_router.h" |
-#include "ui/views/mus/window_manager_connection.h" |
+#include "ui/aura/client/capture_client.h" |
+#include "ui/views/mus/mus_client.h" |
+#include "ui/views/mus/pointer_watcher_event_router2.h" |
#include "ui/views/pointer_watcher.h" |
-ImmersiveContextMus::ImmersiveContextMus() {} |
+ImmersiveContextMus::ImmersiveContextMus( |
+ aura::client::CaptureClient* capture_client) |
+ : capture_client_(capture_client) {} |
ImmersiveContextMus::~ImmersiveContextMus() {} |
@@ -37,21 +39,17 @@ void ImmersiveContextMus::AddPointerWatcher( |
views::PointerWatcher* watcher, |
views::PointerWatcherEventTypes events) { |
// TODO: http://crbug.com/641164 |
- views::WindowManagerConnection::Get() |
- ->pointer_watcher_event_router() |
- ->AddPointerWatcher(watcher, |
- events == views::PointerWatcherEventTypes::MOVES); |
+ views::MusClient::Get()->pointer_watcher_event_router()->AddPointerWatcher( |
+ watcher, events == views::PointerWatcherEventTypes::MOVES); |
} |
void ImmersiveContextMus::RemovePointerWatcher(views::PointerWatcher* watcher) { |
- views::WindowManagerConnection::Get() |
- ->pointer_watcher_event_router() |
- ->RemovePointerWatcher(watcher); |
+ views::MusClient::Get()->pointer_watcher_event_router()->RemovePointerWatcher( |
+ watcher); |
} |
bool ImmersiveContextMus::DoesAnyWindowHaveCapture() { |
- return views::WindowManagerConnection::Get()->client()->GetCaptureWindow() != |
- nullptr; |
+ return capture_client_->GetGlobalCaptureWindow() != nullptr; |
} |
bool ImmersiveContextMus::IsMouseEventsEnabled() { |