Ignore fullscreen windows which are behind other windows for fullscreen mode.

ash/wm/workspace_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/workspace_controller.h"
 
+#include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 33 matching lines @@
 WorkspaceController::~WorkspaceController() {
   viewport_->SetLayoutManager(NULL);
   viewport_->SetEventFilter(NULL);
   viewport_->RemovePreTargetHandler(event_handler_.get());
   viewport_->RemovePostTargetHandler(event_handler_.get());
 }
 
 WorkspaceWindowState WorkspaceController::GetWindowState() const {
   if (!shelf_)
     return WORKSPACE_WINDOW_STATE_DEFAULT;
+  const aura::Window* topmost_fullscreen_window = GetRootWindowController(
+      viewport_->GetRootWindow())->GetTopmostFullscreenWindow();
+  if (topmost_fullscreen_window &&
+      !wm::GetWindowState(topmost_fullscreen_window)->ignored_by_shelf()) {
+    return WORKSPACE_WINDOW_STATE_FULL_SCREEN;
+  }
 
   const gfx::Rect shelf_bounds(shelf_->GetIdealBounds());
   const aura::Window::Windows& windows(viewport_->children());
   bool window_overlaps_launcher = false;
   bool has_maximized_window = false;
   for (aura::Window::Windows::const_iterator i = windows.begin();
        i != windows.end(); ++i) {
     wm::WindowState* window_state = wm::GetWindowState(*i);
     if (window_state->ignored_by_shelf())
       continue;
     ui::Layer* layer = (*i)->layer();
     if (!layer->GetTargetVisibility() || layer->GetTargetOpacity() == 0.0f)
       continue;
     if (window_state->IsMaximized()) {
       // An untracked window may still be fullscreen so we keep iterating when
       // we hit a maximized window.
       has_maximized_window = true;

[pkotwicz, 2013/12/05 02:46:29]

We can return WORKSPACE_WINDOW_STATE_MAXIMIZED immediately here and get rid of
|has_maximized_window|.

[flackr, 2013/12/05 16:48:54]

Nice, the code is getting cleaner and cleaner :-).

-    } else if (window_state->IsFullscreen()) {
-      return WORKSPACE_WINDOW_STATE_FULL_SCREEN;
     }
     if (!window_overlaps_launcher && (*i)->bounds().Intersects(shelf_bounds))
       window_overlaps_launcher = true;
   }
   if (has_maximized_window)
     return WORKSPACE_WINDOW_STATE_MAXIMIZED;
 
   return window_overlaps_launcher ?
       WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF :
       WORKSPACE_WINDOW_STATE_DEFAULT;
@@ skipping 30 matching lines @@
     settings.SetTweenType(gfx::Tween::EASE_OUT);
     settings.SetTransitionDuration(
         base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));
     viewport_->layer()->SetTransform(gfx::Transform());
     viewport_->layer()->SetOpacity(1.0f);
   }
 }
 
 }  // namespace internal
 }  // namespace ash