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

Unified Diff: chrome/browser/ui/views/frame/immersive_context_mus.cc

Issue 2577963006: Revert of Converts chrome to aura-mus (Closed)
Patch Set: Created 4 years 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: 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 78126688d306c84c22320b4962e06446efb76072..7a9e9551ef7d830ee6f2cb89fdb574b5f59252d7 100644
--- a/chrome/browser/ui/views/frame/immersive_context_mus.cc
+++ b/chrome/browser/ui/views/frame/immersive_context_mus.cc
@@ -4,14 +4,12 @@
#include "chrome/browser/ui/views/frame/immersive_context_mus.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 "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/views/pointer_watcher.h"
-ImmersiveContextMus::ImmersiveContextMus(
- aura::client::CaptureClient* capture_client)
- : capture_client_(capture_client) {}
+ImmersiveContextMus::ImmersiveContextMus() {}
ImmersiveContextMus::~ImmersiveContextMus() {}
@@ -39,17 +37,21 @@
views::PointerWatcher* watcher,
views::PointerWatcherEventTypes events) {
// TODO: http://crbug.com/641164
- views::MusClient::Get()->pointer_watcher_event_router()->AddPointerWatcher(
- watcher, events == views::PointerWatcherEventTypes::MOVES);
+ views::WindowManagerConnection::Get()
+ ->pointer_watcher_event_router()
+ ->AddPointerWatcher(watcher,
+ events == views::PointerWatcherEventTypes::MOVES);
}
void ImmersiveContextMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
- views::MusClient::Get()->pointer_watcher_event_router()->RemovePointerWatcher(
- watcher);
+ views::WindowManagerConnection::Get()
+ ->pointer_watcher_event_router()
+ ->RemovePointerWatcher(watcher);
}
bool ImmersiveContextMus::DoesAnyWindowHaveCapture() {
- return capture_client_->GetGlobalCaptureWindow() != nullptr;
+ return views::WindowManagerConnection::Get()->client()->GetCaptureWindow() !=
+ nullptr;
}
bool ImmersiveContextMus::IsMouseEventsEnabled() {
« no previous file with comments | « chrome/browser/ui/views/frame/immersive_context_mus.h ('k') | chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698