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

Unified Diff: ash/wm/ash_focus_rules.cc

Issue 24108003: [Cleanup] Rename WindowSettings to WindowState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 851dbbaeaaec98c75007957e72597aa20989e0d9..e6688d73654b8230057af224591c140be64c7c41 100644
--- a/ash/wm/ash_focus_rules.cc
+++ b/ash/wm/ash_focus_rules.cc
@@ -6,7 +6,7 @@
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
-#include "ash/wm/window_util.h"
+#include "ash/wm/window_state.h"
#include "ui/aura/window.h"
namespace ash {
@@ -74,7 +74,7 @@ bool AshFocusRules::IsWindowConsideredVisibleForActivation(
// Minimized windows are hidden in their minimized state, but they can always
// be activated.
- if (wm::IsWindowMinimized(window))
+ if (wm::GetWindowState(window)->IsMinimized())
return true;
return window->TargetVisibility() && (window->parent()->id() ==
@@ -154,7 +154,10 @@ aura::Window* AshFocusRules::GetTopmostWindowToActivateInContainer(
container->children().rbegin();
i != container->children().rend();
++i) {
- if (*i != ignore && CanActivateWindow(*i) && !wm::IsWindowMinimized(*i))
+ WindowState* window_state = GetWindowState(*i);
+ if (*i != ignore &&
+ window_state->CanActivate() &&
+ !window_state->IsMinimized())
return *i;
}
return NULL;

Powered by Google App Engine
This is Rietveld 408576698