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

Unified Diff: ash/common/wm/immersive_context_ash.cc

Issue 2787363002: Moves couple of WmShell methods to standalone functions (Closed)
Patch Set: feedback and fix applist Created 3 years, 9 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: ash/common/wm/immersive_context_ash.cc
diff --git a/ash/common/wm/immersive_context_ash.cc b/ash/common/wm/immersive_context_ash.cc
index c1cff55ec4fd33e1454244250ae8eebc7a3cfbe3..80d4dae75124ac17a7f366fcddbb902fb093d6d1 100644
--- a/ash/common/wm/immersive_context_ash.cc
+++ b/ash/common/wm/immersive_context_ash.cc
@@ -9,6 +9,7 @@
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/shared/immersive_fullscreen_controller.h"
+#include "ash/wm/window_util.h"
#include "base/logging.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
@@ -56,7 +57,7 @@ void ImmersiveContextAsh::RemovePointerWatcher(views::PointerWatcher* watcher) {
}
bool ImmersiveContextAsh::DoesAnyWindowHaveCapture() {
- return WmShell::Get()->GetCaptureWindow() != nullptr;
+ return wm::GetCaptureWindow() != nullptr;
}
bool ImmersiveContextAsh::IsMouseEventsEnabled() {
« no previous file with comments | « ash/common/wm/fullscreen_window_finder.cc ('k') | ash/common/wm/maximize_mode/maximize_mode_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698