Commit 2e460902 authored by tfarina@chromium.org's avatar tfarina@chromium.org

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
parent 734994f9
......@@ -69,12 +69,6 @@ struct ASH_EXPORT LauncherItem {
typedef std::vector<LauncherItem> LauncherItems;
// The direction of the focus cycling.
enum CycleDirection {
CYCLE_FORWARD,
CYCLE_BACKWARD
};
// LauncherItemDetails may be set on Window (by way of
// SetShelfItemDetailsForWindow) to make the window appear in the shelf. See
// ShelfWindowWatcher for details.
......
......@@ -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"
......
......@@ -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_
......@@ -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 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment