exo: Further improve ignored-by-shelf test.

components/exo/shell_surface.cc

 // Copyright 2015 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 "components/exo/shell_surface.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_state.h"
@@ skipping 361 matching lines @@
   origin_ += pending_origin_offset_;
   pending_origin_offset_ = gfx::Vector2d();
 
   // Update resize direction to reflect acknowledged configure requests.
   resize_component_ = pending_resize_component_;
 
   if (widget_) {
     UpdateWidgetBounds();
 
     gfx::Point surface_origin = GetSurfaceOrigin();
-    gfx::Rect hit_test_bounds =
-        surface_->GetHitTestBounds() + surface_origin.OffsetFromOrigin();
 
-    // Only allow the shelf to recognize this window if the hit-test bounds
-    // contains the widget bounds. This prevents shaped windows that might
-    // only occupy a small area of the widget from dimming the shelf when
-    // maximized.
-    bool ignored_by_shelf = !hit_test_bounds.Contains(
-        gfx::Rect(widget_->GetNativeWindow()->bounds().size()));
+    // Determine if window should be ignored by shelf if all configure requests
+    // have been acknowledged.
+    if (pending_configs_.empty()) {
+      gfx::Rect hit_test_bounds =
+          surface_->GetHitTestBounds() + surface_origin.OffsetFromOrigin();
 
-    // Update state and shelf visibility if |ignored_by_shelf| changed.
-    ash::wm::WindowState* window_state =
-        ash::wm::GetWindowState(widget_->GetNativeWindow());
-    if (ignored_by_shelf != window_state->ignored_by_shelf()) {
-      window_state->set_ignored_by_shelf(ignored_by_shelf);
-      ash::Shell::GetInstance()->UpdateShelfVisibility();
+      // When maximized, only allow the shelf to recognize this window if the
+      // hit-test bounds contains the widget bounds. This prevents shaped
+      // windows that might only occupy a small area of the widget from dimming
+      // the shelf when maximized.
+      bool ignored_by_shelf = widget_->IsMaximized() &&
+                              !hit_test_bounds.Contains(gfx::Rect(
+                                  widget_->GetNativeWindow()->bounds().size()));
+
+      // Update state and shelf visibility if |ignored_by_shelf| changed.
+      ash::wm::WindowState* window_state =
+          ash::wm::GetWindowState(widget_->GetNativeWindow());
+      if (ignored_by_shelf != window_state->ignored_by_shelf()) {
+        window_state->set_ignored_by_shelf(ignored_by_shelf);
+        ash::Shell::GetInstance()->UpdateShelfVisibility();
+      }
     }
 
     // Update surface bounds.
     surface_->SetBounds(gfx::Rect(surface_origin, surface_->layer()->size()));
 
     // Show widget if not already visible.
     if (!widget_->IsClosed() && !widget_->IsVisible())
       widget_->Show();
   }
 }
@@ skipping 485 matching lines @@
   DCHECK(!ignore_window_bounds_changes_);
   ignore_window_bounds_changes_ = true;
   widget_->SetBounds(new_widget_bounds);
   ignore_window_bounds_changes_ = false;
 
   // A change to the widget size requires surface bounds to be re-adjusted.
   surface_->SetBounds(gfx::Rect(GetSurfaceOrigin(), surface_->layer()->size()));
 }
 
 }  // namespace exo