Restore tray background when locking screen.

ash/wm/shelf_layout_manager.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/shelf_layout_manager.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 253 matching lines @@
                                                  const void* key,
                                                  intptr_t old) {
   if (key == aura::client::kRootWindowActiveWindowKey)
     UpdateAutoHideStateNow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfLayoutManager, private:
 
 void ShelfLayoutManager::SetState(VisibilityState visibility_state) {
+  ShellDelegate* delegate = Shell::GetInstance()->delegate();
   State state;
   state.visibility_state = visibility_state;
   state.auto_hide_state = CalculateAutoHideState(visibility_state);
+  state.locked_state = delegate && delegate->IsScreenLocked();
 
   if (state_.Equals(state))
     return;  // Nothing changed.
 
   if (state.visibility_state == AUTO_HIDE) {
     // When state is AUTO_HIDE we need to track when the mouse is over the
     // launcher to unhide the shelf. AutoHideEventFilter does that for us.
     if (!event_filter_.get())
       event_filter_.reset(new AutoHideEventFilter(this));
   } else {
@@ skipping 89 matching lines @@
   bool launcher_paints = GetLauncherPaintsBackground();
   if (launcher_)
     launcher_->SetPaintsBackground(launcher_paints, type);
   // SystemTray normally draws a background, but we don't want it to draw a
   // background when the launcher does.
   if (Shell::GetInstance()->tray())
     Shell::GetInstance()->tray()->SetPaintsBackground(!launcher_paints, type);
 }
 
 bool ShelfLayoutManager::GetLauncherPaintsBackground() const {
-  return window_overlaps_shelf_ || state_.visibility_state == AUTO_HIDE;
+  return (!state_.locked_state && window_overlaps_shelf_) ||
+      state_.visibility_state == AUTO_HIDE;
 }
 
 void ShelfLayoutManager::UpdateAutoHideStateNow() {
   SetState(state_.visibility_state);
 }
 
 ShelfLayoutManager::AutoHideState ShelfLayoutManager::CalculateAutoHideState(
     VisibilityState visibility_state) const {
   if (visibility_state != AUTO_HIDE || !launcher_widget())
     return AUTO_HIDE_HIDDEN;
@@ skipping 28 matching lines @@
     insets.Set(kWorkspaceAreaBottomInset, 0, 0, 0);
   }
   if (launcher_widget() && launcher_widget()->GetNativeWindow())
     launcher_widget()->GetNativeWindow()->set_hit_test_bounds_override_outer(
         insets);
   status_->GetNativeWindow()->set_hit_test_bounds_override_outer(insets);
 }
 
 }  // namespace internal
 }  // namespace ash