Aura: New window shadows, desktop background debug toggle

ash/wm/shadow_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/shadow_controller.h"
 
 #include <utility>
 
 #include "ash/ash_switches.h"
 #include "ash/wm/shadow.h"
 #include "ash/wm/shadow_types.h"
 #include "ash/wm/window_properties.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "ui/aura/client/activation_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 
 using std::make_pair;
 
 namespace ash {
 namespace internal {
 
 namespace {
 
 ShadowType GetShadowTypeFromWindow(aura::Window* window) {
   // No shadow for transparent window.
   if (window->transparent())
     return SHADOW_TYPE_NONE;
 
   switch (window->type()) {
     case aura::client::WINDOW_TYPE_NORMAL:
     case aura::client::WINDOW_TYPE_PANEL:
-      return CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kAuraTranslucentFrames) ?
-              SHADOW_TYPE_NONE : SHADOW_TYPE_RECTANGULAR;
     case aura::client::WINDOW_TYPE_MENU:
     case aura::client::WINDOW_TYPE_TOOLTIP:
       return SHADOW_TYPE_RECTANGULAR;
     default:
       break;
   }
   return SHADOW_TYPE_NONE;
 }
 
 }  // namespace
 
 ShadowController::ShadowController() {
   aura::Env::GetInstance()->AddObserver(this);
+  // Watch for window activation changes.
+  aura::RootWindow::GetInstance()->AddObserver(this);
 }
 
 ShadowController::~ShadowController() {
   for (WindowShadowMap::const_iterator it = window_shadows_.begin();
        it != window_shadows_.end(); ++it) {
     it->first->RemoveObserver(this);
   }
+  aura::RootWindow::GetInstance()->RemoveObserver(this);
   aura::Env::GetInstance()->RemoveObserver(this);
 }
 
 void ShadowController::OnWindowInitialized(aura::Window* window) {
   window->AddObserver(this);
   SetShadowType(window, GetShadowTypeFromWindow(window));
   HandlePossibleShadowVisibilityChange(window);
 }
 
 void ShadowController::OnWindowPropertyChanged(aura::Window* window,
                                                const void* key,
                                                intptr_t old) {
-  if (key == kShadowTypeKey)
+  if (key == kShadowTypeKey) {
     HandlePossibleShadowVisibilityChange(window);
+    return;
+  }
+  if (key == aura::client::kRootWindowActiveWindowKey) {
+    aura::Window* inactive = reinterpret_cast<aura::Window*>(old);
+    HandleWindowActivationChange(inactive, false);

[Daniel Erat, 2012/02/17 00:18:32]

mind moving the NULL check out of HandleWindowActivationChange() and putting it
here instead?

[James Cook, 2012/02/17 03:41:27]

Done.

+    aura::Window* active =
+        window->GetProperty(aura::client::kRootWindowActiveWindowKey);
+    HandleWindowActivationChange(active, true);
+    return;
+  }
 }
 
 void ShadowController::OnWindowBoundsChanged(aura::Window* window,
                                              const gfx::Rect& bounds) {
   Shadow* shadow = GetShadowForWindow(window);
   if (shadow)
     shadow->SetContentBounds(gfx::Rect(bounds.size()));
 }
 
 void ShadowController::OnWindowDestroyed(aura::Window* window) {
@@ skipping 11 matching lines @@
       NOTREACHED() << "Unknown shadow type " << type;
       return false;
   }
 }
 
 Shadow* ShadowController::GetShadowForWindow(aura::Window* window) {
   WindowShadowMap::const_iterator it = window_shadows_.find(window);
   return it != window_shadows_.end() ? it->second.get() : NULL;
 }
 
+void ShadowController::HandleWindowActivationChange(aura::Window* window,
+                                                    bool active) {
+  if (!window)
+    return;
+  Shadow* shadow = GetShadowForWindow(window);
+  if (shadow)
+    shadow->SetStyle(active ? Shadow::STYLE_ACTIVE : Shadow::STYLE_INACTIVE);
+}
+
 void ShadowController::HandlePossibleShadowVisibilityChange(
     aura::Window* window) {
   const bool should_show = ShouldShowShadowForWindow(window);
   Shadow* shadow = GetShadowForWindow(window);
   if (shadow)
     shadow->layer()->SetVisible(should_show);
   else if (should_show && !shadow)
     CreateShadowForWindow(window);
 }
 
 void ShadowController::CreateShadowForWindow(aura::Window* window) {
   linked_ptr<Shadow> shadow(new Shadow());
   window_shadows_.insert(make_pair(window, shadow));
 
   shadow->Init();
   shadow->SetContentBounds(gfx::Rect(window->bounds().size()));
   shadow->layer()->SetVisible(ShouldShowShadowForWindow(window));
   window->layer()->Add(shadow->layer());
 }
 
 }  // namespace internal
 }  // namespace ash