| Index: ash/shelf/shelf_util.cc
|
| diff --git a/ash/shelf/shelf_util.cc b/ash/shelf/shelf_util.cc
|
| index 66fcf17dcaa9468c1f3d871a926c46aa043a01d2..717937f0dbc7a15d4cd09609c43848818e5b2848 100644
|
| --- a/ash/shelf/shelf_util.cc
|
| +++ b/ash/shelf/shelf_util.cc
|
| @@ -15,9 +15,7 @@ DEFINE_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);
|
| +DEFINE_OWNED_WINDOW_PROPERTY_KEY(ShelfItemDetails, kShelfItemDetailsKey, NULL);
|
|
|
| void SetShelfIDForWindow(ShelfID id, aura::Window* window) {
|
| if (!window)
|
| @@ -53,8 +51,7 @@ void ClearShelfItemDetailsForWindow(aura::Window* window) {
|
| window->ClearProperty(kShelfItemDetailsKey);
|
| }
|
|
|
| -const ShelfItemDetails* GetShelfItemDetailsForWindow(
|
| - aura::Window* window) {
|
| +const ShelfItemDetails* GetShelfItemDetailsForWindow(aura::Window* window) {
|
| return window->GetProperty(kShelfItemDetailsKey);
|
| }
|
|
|
|
|