summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 19:37:31 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 19:37:31 +0000
commitef80e4308a8960d1965e539dc60e1505133ca677 (patch)
tree5fb893ce5eb4c3482562615f5fb8015ab59c405a /ash/shell.h
parent5bb6f3c52b5946eaadb989734864a202c4e4ce8d (diff)
downloadchromium_src-ef80e4308a8960d1965e539dc60e1505133ca677.zip
chromium_src-ef80e4308a8960d1965e539dc60e1505133ca677.tar.gz
chromium_src-ef80e4308a8960d1965e539dc60e1505133ca677.tar.bz2
Cleanup enums for shelf
- move enums from ShelfLayoutManager to shelf_types.h - remove redundant VisibilityState - added SHELF_ prefix to these state. BUG=151417 TEST=none Review URL: https://chromiumcodereview.appspot.com/11316323 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell.h b/ash/shell.h
index 6880ecb..1ea200d 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -9,9 +9,9 @@
#include <vector>
#include "ash/ash_export.h"
+#include "ash/shelf_types.h"
#include "ash/system/user/login_status.h"
#include "ash/wm/cursor_manager.h"
-#include "ash/wm/shelf_types.h"
#include "ash/wm/system_modal_container_event_filter_delegate.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"