Revert of Remove remaining window states where window is shown with opacity 0.

ash/shelf/shelf_util.cc

 // Copyright 2013 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/shelf/shelf_util.h"
 
 #include "ash/shelf/shelf_constants.h"
 #include "ui/aura/window_property.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::ShelfID);
 DECLARE_WINDOW_PROPERTY_TYPE(ash::ShelfItemDetails*);
 
 namespace ash {
 
-DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfID, kInvalidShelfID);
+DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ShelfID, kShelfID, kInvalidShelfID);
 
 // ShelfItemDetails for kShelfItemDetaildKey is owned by the window
 // and will be freed automatically.
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ShelfItemDetails,
                                  kShelfItemDetailsKey,
                                  NULL);
 
 void SetShelfIDForWindow(ShelfID id, aura::Window* window) {
   if (!window)
     return;
@@ skipping 16 matching lines @@
 void ClearShelfItemDetailsForWindow(aura::Window* window) {
   window->ClearProperty(kShelfItemDetailsKey);
 }
 
 const ShelfItemDetails* GetShelfItemDetailsForWindow(
     aura::Window* window) {
   return window->GetProperty(kShelfItemDetailsKey);
 }
 
 }  // namespace ash