diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 23:51:27 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 23:51:27 +0000 |
| commit | eec097142c4b7d09ff01a03e2e2117f290d68cfc (patch) | |
| tree | e31de7ef3985e92eabbfb65ed10dac797c0ba0b6 /ash/shelf/shelf_util.h | |
| parent | 3b3af9753ec5dd2796df0555900515bb8ba0c613 (diff) | |
| download | chromium_src-eec097142c4b7d09ff01a03e2e2117f290d68cfc.zip chromium_src-eec097142c4b7d09ff01a03e2e2117f290d68cfc.tar.gz chromium_src-eec097142c4b7d09ff01a03e2e2117f290d68cfc.tar.bz2 | |
Renames LauncherID, LauncherItem and LauncherItems...
to ShelfID, ShelfItem and ShelfItems.
BUG=248353
TEST=None
R=jamescook@chromium.org,harrym@chromium.org
Review URL: https://codereview.chromium.org/152223002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf/shelf_util.h')
| -rw-r--r-- | ash/shelf/shelf_util.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ash/shelf/shelf_util.h b/ash/shelf/shelf_util.h index ce83dcc..f4c4b80 100644 --- a/ash/shelf/shelf_util.h +++ b/ash/shelf/shelf_util.h @@ -6,7 +6,6 @@ #define ASH_SHELF_SHELF_UTIL_H_ #include "ash/ash_export.h" -#include "ash/launcher/launcher_types.h" #include "ash/shelf/shelf_item_types.h" #include "ui/aura/window.h" @@ -19,21 +18,21 @@ namespace ash { extern const aura::WindowProperty<ShelfItemDetails*>* const kShelfItemDetailsKey; -// Associates LauncherItem of |id| with specified |window|. -ASH_EXPORT void SetLauncherIDForWindow(LauncherID id, aura::Window* window); +// Associates ShelfItem of |id| with specified |window|. +ASH_EXPORT void SetShelfIDForWindow(ShelfID id, aura::Window* window); -// Returns the id of the LauncherItem associated with the specified |window|, +// Returns the id of the ShelfItem associated with the specified |window|, // or 0 if there isn't one. -// Note: Window of a tabbed browser will return the |LauncherID| of the +// Note: Window of a tabbed browser will return the |ShelfID| of the // currently active tab. -ASH_EXPORT LauncherID GetLauncherIDForWindow(aura::Window* window); +ASH_EXPORT ShelfID GetShelfIDForWindow(aura::Window* window); // Sets ShelfItemDetails for |window|. ASH_EXPORT void SetShelfItemDetailsForWindow(aura::Window* window, const ShelfItemDetails& details); // Clears ShelfItemDetails for |window|. -// If |window| has a LauncherItem by SetShelfItemDetailsForWindow(), it will +// If |window| has a ShelfItem by SetShelfItemDetailsForWindow(), it will // be removed. ASH_EXPORT void ClearShelfItemDetailsForWindow(aura::Window* window); |