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

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

Issue 2741273002: chromeos: Promotes more from WmShell to Shell (Closed)
Patch Set: feedback 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
« no previous file with comments | « ash/common/wallpaper/wallpaper_widget_controller.cc ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/focus_rules.cc
diff --git a/ash/common/wm/focus_rules.cc b/ash/common/wm/focus_rules.cc
index e0634e62ac9fa1fa75e6b5229598ead37b5e8028..5bbc224a28ef6c79d42aa3d5e61dad3cdd33742c 100644
--- a/ash/common/wm/focus_rules.cc
+++ b/ash/common/wm/focus_rules.cc
@@ -6,9 +6,9 @@
#include "ash/common/shell_delegate.h"
#include "ash/common/wm/window_state.h"
-#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
+#include "ash/shell.h"
namespace ash {
@@ -37,7 +37,7 @@ bool IsWindowConsideredVisibleForActivation(WmWindow* window) {
DCHECK(window);
// If the |window| doesn't belong to the current active user and also doesn't
// show for the current active user, then it should not be activated.
- if (!WmShell::Get()->delegate()->CanShowWindowForUser(window))
+ if (!Shell::Get()->shell_delegate()->CanShowWindowForUser(window))
return false;
if (window->IsVisible())
« no previous file with comments | « ash/common/wallpaper/wallpaper_widget_controller.cc ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698