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

Unified Diff: ash/wm/ash_focus_rules.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/ash_focus_rules.cc
diff --git a/ash/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc
index 54402f29a5cda6e16117f1b4e3dd4cc2c56c0a3b..ac4d9a8d5632563c6275db5b47a2fa061bc2e870 100644
--- a/ash/wm/ash_focus_rules.cc
+++ b/ash/wm/ash_focus_rules.cc
@@ -6,12 +6,12 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/wm/container_finder.h"
#include "ash/wm/focus_rules.h"
#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "ui/aura/window.h"
@@ -65,7 +65,7 @@ bool AshFocusRules::CanActivateWindow(aura::Window* window) const {
if (!BaseFocusRules::CanActivateWindow(window))
return false;
- if (WmShell::Get()->IsSystemModalWindowOpen()) {
+ if (ShellPort::Get()->IsSystemModalWindowOpen()) {
return BelongsToContainerWithEqualOrGreaterId(
window, kShellWindowId_SystemModalContainer);
}

Powered by Google App Engine
This is Rietveld 408576698