Revert of Do not hide shadow underlay for max/fullscreen state even if the client disables the ...

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 <algorithm>
 
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 1540 matching lines @@
 
   surface_->window()->SetBounds(
       gfx::Rect(GetSurfaceOrigin() + client_view_bounds.OffsetFromOrigin(),
                 surface_->window()->layer()->size()));
 }
 
 void ShellSurface::UpdateShadow() {
   if (!widget_ || !surface_)
     return;
   aura::Window* window = widget_->GetNativeWindow();
-
-  bool underlay_capture_events =
-      WMHelper::GetInstance()->IsSpokenFeedbackEnabled() && widget_->IsActive();
-  bool black_background_enabled =
-      ((widget_->IsFullscreen() || widget_->IsMaximized()) ||
-       underlay_capture_events) &&
-      ash::wm::GetWindowState(window)->allow_set_bounds_direct() &&
-      window->layer()->GetTargetTransform().IsIdentity();
-  if (!shadow_enabled_ && !black_background_enabled) {
+  if (!shadow_enabled_) {
     wm::SetShadowElevation(window, wm::ShadowElevation::NONE);
     if (shadow_underlay_)
       shadow_underlay_->Hide();
   } else {
     wm::SetShadowElevation(window, wm::ShadowElevation::MEDIUM);
     gfx::Rect shadow_content_bounds =
         gfx::ScaleToEnclosedRect(shadow_content_bounds_, 1.f / scale_);
 
     // Convert from screen to display coordinates.
     if (!shadow_content_bounds.IsEmpty()) {
@@ skipping 47 matching lines @@
       DCHECK(shadow_underlay_->layer()->fills_bounds_opaquely());
       if (shadow_underlay_in_surface_) {
         surface_->window()->AddChild(shadow_underlay_);
         surface_->window()->StackChildAtBottom(shadow_underlay_);
       } else {
         window->AddChild(shadow_underlay_);
         window->StackChildAtBottom(shadow_underlay_);
       }
     }
 
+    bool underlay_capture_events =
+        WMHelper::GetInstance()->IsSpokenFeedbackEnabled() &&
+        widget_->IsActive();
+
     float shadow_underlay_opacity = shadow_background_opacity_;
 
     // Put the black background layer behind the window if
     // 1) the window is in immersive fullscreen, maximized or is active with
     //    spoken feedback enabled.
     // 2) the window can control the bounds of the window in fullscreen (
     //    thus the background can be visible).
     // 3) the window has no transform (the transformed background may
     //    not cover the entire background, e.g. overview mode).
-    if (black_background_enabled) {
+    if ((widget_->IsFullscreen() || widget_->IsMaximized() ||
+         underlay_capture_events) &&
+        ash::wm::GetWindowState(window)->allow_set_bounds_direct() &&
+        window->layer()->GetTargetTransform().IsIdentity()) {
       if (shadow_underlay_in_surface_) {
         shadow_underlay_bounds = gfx::Rect(surface_->window()->bounds().size());
       } else {
         gfx::Point origin;
         origin -= window->bounds().origin().OffsetFromOrigin();
         shadow_bounds.set_origin(origin);
         shadow_bounds.set_size(window->parent()->bounds().size());
       }
       shadow_underlay_opacity = 1.0f;
     }
 
     if (!shadow_underlay_in_surface_)
       shadow_underlay_bounds = shadow_bounds;
 
-    shadow_underlay_->SetBounds(shadow_underlay_bounds);
-
     // Constrain the underlay bounds to the client area in case shell surface
     // frame is enabled.
     if (frame_enabled_) {
       shadow_underlay_bounds.Intersect(
           widget_->non_client_view()->frame_view()->GetBoundsForClientView());
     }
 
+    shadow_underlay_->SetBounds(shadow_underlay_bounds);
+
     shadow_underlay_->Show();
 
     // TODO(oshima): Setting to the same value should be no-op.
     // crbug.com/642223.
     if (shadow_underlay_opacity !=
         shadow_underlay_->layer()->GetTargetOpacity()) {
       shadow_underlay_->layer()->SetOpacity(shadow_underlay_opacity);
     }
 
     wm::Shadow* shadow = wm::ShadowController::GetShadowForWindow(window);
@@ skipping 31 matching lines @@
 gfx::Point ShellSurface::GetMouseLocation() const {
   aura::Window* const root_window = widget_->GetNativeWindow()->GetRootWindow();
   gfx::Point location =
       root_window->GetHost()->dispatcher()->GetLastMouseLocationInRoot();
   aura::Window::ConvertPointToTarget(
       root_window, widget_->GetNativeWindow()->parent(), &location);
   return location;
 }
 
 }  // namespace exo