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

Unified Diff: ash/wm/immersive_context_ash.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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/wm/immersive_context_ash.cc
diff --git a/ash/wm/immersive_context_ash.cc b/ash/wm/immersive_context_ash.cc
index 226eab4d0103c04be2bce1909801b8172443366f..580d0777b61ca37891c5e3736845610d5cf231b5 100644
--- a/ash/wm/immersive_context_ash.cc
+++ b/ash/wm/immersive_context_ash.cc
@@ -6,9 +6,9 @@
#include "ash/shared/immersive_fullscreen_controller.h"
#include "ash/shelf/wm_shelf.h"
+#include "ash/shell_port.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "base/logging.h"
#include "ui/display/display.h"
@@ -37,7 +37,7 @@ void ImmersiveContextAsh::OnEnteringOrExitingImmersive(
// Update the window's immersive mode state for the window manager.
window_state->set_in_immersive_fullscreen(entering);
- for (WmWindow* root_window : WmShell::Get()->GetAllRootWindows())
+ for (WmWindow* root_window : ShellPort::Get()->GetAllRootWindows())
WmShelf::ForWindow(root_window)->UpdateVisibilityState();
}
@@ -49,11 +49,11 @@ gfx::Rect ImmersiveContextAsh::GetDisplayBoundsInScreen(views::Widget* widget) {
void ImmersiveContextAsh::AddPointerWatcher(
views::PointerWatcher* watcher,
views::PointerWatcherEventTypes events) {
- WmShell::Get()->AddPointerWatcher(watcher, events);
+ ShellPort::Get()->AddPointerWatcher(watcher, events);
}
void ImmersiveContextAsh::RemovePointerWatcher(views::PointerWatcher* watcher) {
- WmShell::Get()->RemovePointerWatcher(watcher);
+ ShellPort::Get()->RemovePointerWatcher(watcher);
}
bool ImmersiveContextAsh::DoesAnyWindowHaveCapture() {
@@ -61,7 +61,7 @@ bool ImmersiveContextAsh::DoesAnyWindowHaveCapture() {
}
bool ImmersiveContextAsh::IsMouseEventsEnabled() {
- return WmShell::Get()->IsMouseEventsEnabled();
+ return ShellPort::Get()->IsMouseEventsEnabled();
}
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698