From 2e4609029513fda1e380640e1446974c815dcd38 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 7 Jan 2014 10:48:04 +0000 Subject: Move CycleDirection enum into shelf_constants. I decided to move it there, because enum really defines 'constants'. I'm considering moving the remaining of launcher_types.h into a new file called shelf_item.h, since the types there are really related/tied to ShelfItem. BUG=248353 TEST=None, no functional changes R=jamescook@chromium.org,harrym@chromium.org Review URL: https://codereview.chromium.org/123073002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243247 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/shelf/shelf.h | 2 +- ash/shelf/shelf_constants.h | 6 ++++++ ash/shelf/shelf_navigator.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'ash/shelf') diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h index 00cb127..03cc2b0 100644 --- a/ash/shelf/shelf.h +++ b/ash/shelf/shelf.h @@ -6,7 +6,7 @@ #define ASH_SHELF_SHELF_H_ #include "ash/ash_export.h" -#include "ash/launcher/launcher_types.h" +#include "ash/shelf/shelf_constants.h" #include "ash/shelf/shelf_types.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" diff --git a/ash/shelf/shelf_constants.h b/ash/shelf/shelf_constants.h index 7696774..2e0a8e8 100644 --- a/ash/shelf/shelf_constants.h +++ b/ash/shelf/shelf_constants.h @@ -23,6 +23,12 @@ extern const int kInvalidShelfID; // Animation duration for switching black shelf and dock background on and off. ASH_EXPORT extern const int kTimeToSwitchBackgroundMs; +// The direction of the focus cycling. +enum CycleDirection { + CYCLE_FORWARD, + CYCLE_BACKWARD +}; + } // namespace ash #endif // ASH_SHELF_SHELF_CONSTANTS_H_ diff --git a/ash/shelf/shelf_navigator.h b/ash/shelf/shelf_navigator.h index b8ecfb3..f7ced22 100644 --- a/ash/shelf/shelf_navigator.h +++ b/ash/shelf/shelf_navigator.h @@ -6,7 +6,7 @@ #define ASH_SHELF_SHELF_NAVIGATOR_H_ #include "ash/ash_export.h" -#include "ash/launcher/launcher_types.h" +#include "ash/shelf/shelf_constants.h" namespace ash { -- cgit v1.1