Revert 109966 - Grab-bag:

ui/aura/desktop.cc

 // Copyright (c) 2011 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 "ui/aura/desktop.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 305 matching lines @@
   // The layer, and all the observers should be notified of the
   // transformed size of the desktop.
   gfx::Rect bounds(size);
   layer()->transform().TransformRect(&bounds);
   SetBounds(gfx::Rect(bounds.size()));
   FOR_EACH_OBSERVER(DesktopObserver, observers_,
                     OnDesktopResized(bounds.size()));
 }
 
 void Desktop::SetActiveWindow(Window* window, Window* to_focus) {
-  if (!window)
-    return;
   // The stacking client may impose rules on what window configurations can be
   // activated or deactivated.
-  if (!stacking_client_->CanActivateWindow(window))
+  if (window && !stacking_client_->CanActivateWindow(window))
     return;
   // The window may not be activate-able.
-  if (!window->CanActivate())
+  if (window && !window->CanActivate())
     return;
   // Nothing may actually have changed.
   if (active_window_ == window)
     return;
 
   Window* old_active = active_window_;
   active_window_ = window;
   // Invoke OnLostActive after we've changed the active window. That way if the
   // delegate queries for active state it doesn't think the window is still
   // active.
@@ skipping 262 matching lines @@
       base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) {
     bounds.set_size(gfx::Size(parsed_width, parsed_height));
   } else if (use_fullscreen_host_window_) {
     bounds = gfx::Rect(DesktopHost::GetNativeDisplaySize());
   }
 
   return bounds;
 }
 
 }  // namespace aura