| Index: ash/wm/ash_focus_rules.cc
|
| diff --git a/ash/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc
|
| index 010365a77870ace7afe2569b3f018b02faaf388d..929c3ace52fecfc1ba54a834ed27a4f4f4ca2fa2 100644
|
| --- a/ash/wm/ash_focus_rules.cc
|
| +++ b/ash/wm/ash_focus_rules.cc
|
| @@ -33,11 +33,9 @@ bool BelongsToContainerWithEqualOrGreaterId(const aura::Window* window,
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // AshFocusRules, public:
|
|
|
| -AshFocusRules::AshFocusRules() {
|
| -}
|
| +AshFocusRules::AshFocusRules() {}
|
|
|
| -AshFocusRules::~AshFocusRules() {
|
| -}
|
| +AshFocusRules::~AshFocusRules() {}
|
|
|
| bool AshFocusRules::IsWindowConsideredActivatable(aura::Window* window) const {
|
| return ash::IsWindowConsideredActivatable(WmWindowAura::Get(window));
|
| @@ -125,7 +123,7 @@ aura::Window* AshFocusRules::GetTopmostWindowToActivateForContainerIndex(
|
| aura::Window::Windows containers = Shell::GetContainersFromAllRootWindows(
|
| kActivatableShellWindowIds[index], root);
|
| for (aura::Window::Windows::const_iterator iter = containers.begin();
|
| - iter != containers.end() && !window; ++iter) {
|
| + iter != containers.end() && !window; ++iter) {
|
| window = GetTopmostWindowToActivateInContainer((*iter), ignore);
|
| }
|
| return window;
|
| @@ -136,11 +134,9 @@ aura::Window* AshFocusRules::GetTopmostWindowToActivateInContainer(
|
| aura::Window* ignore) const {
|
| for (aura::Window::Windows::const_reverse_iterator i =
|
| container->children().rbegin();
|
| - i != container->children().rend();
|
| - ++i) {
|
| + i != container->children().rend(); ++i) {
|
| WindowState* window_state = GetWindowState(*i);
|
| - if (*i != ignore &&
|
| - window_state->CanActivate() &&
|
| + if (*i != ignore && window_state->CanActivate() &&
|
| !window_state->IsMinimized())
|
| return *i;
|
| }
|
|
|