Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Side by Side Diff: ash/shelf/shelf_util.h

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/shelf/shelf_types.h ('k') | ash/shelf/shelf_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELF_SHELF_UTIL_H_ 5 #ifndef ASH_SHELF_SHELF_UTIL_H_
6 #define ASH_SHELF_SHELF_UTIL_H_ 6 #define ASH_SHELF_SHELF_UTIL_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/shelf/shelf_types.h"
9 #include "ash/shelf/shelf_item_types.h" 10 #include "ash/shelf/shelf_item_types.h"
10 #include "ash/shelf/shelf_types.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 13
14 namespace aura { 14 namespace aura {
15 class Window; 15 class Window;
16 } 16 }
17 17
18 namespace ash { 18 namespace ash {
19 19
20 // A property key to store the id of the ShelfItem associated with the window. 20 // A property key to store the id of the ShelfItem associated with the window.
(...skipping 30 matching lines...) Expand all
51 ASH_EXPORT void ClearShelfItemDetailsForWindow(aura::Window* window); 51 ASH_EXPORT void ClearShelfItemDetailsForWindow(aura::Window* window);
52 52
53 // Returns ShelfItemDetails for |window| or NULL if it doesn't have. 53 // Returns ShelfItemDetails for |window| or NULL if it doesn't have.
54 // Returned ShelfItemDetails object is owned by the |window|. 54 // Returned ShelfItemDetails object is owned by the |window|.
55 ASH_EXPORT const ShelfItemDetails* GetShelfItemDetailsForWindow( 55 ASH_EXPORT const ShelfItemDetails* GetShelfItemDetailsForWindow(
56 aura::Window* window); 56 aura::Window* window);
57 57
58 } // namespace ash 58 } // namespace ash
59 59
60 #endif // ASH_SHELF_SHELF_UTIL_H_ 60 #endif // ASH_SHELF_SHELF_UTIL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_types.h ('k') | ash/shelf/shelf_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698