summaryrefslogtreecommitdiffstats
path: root/ash/launcher/overflow_button.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/launcher/overflow_button.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/launcher/overflow_button.h')
-rw-r--r--ash/launcher/overflow_button.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/launcher/overflow_button.h b/ash/launcher/overflow_button.h
index 4a911f1..be24ba6 100644
--- a/ash/launcher/overflow_button.h
+++ b/ash/launcher/overflow_button.h
@@ -5,7 +5,7 @@
#ifndef ASH_LAUNCHER_OVERFLOW_BUTTON_H_
#define ASH_LAUNCHER_OVERFLOW_BUTTON_H_
-#include "ash/wm/shelf_types.h"
+#include "ash/shelf_types.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ui/views/controls/button/custom_button.h"