diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:37:31 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:37:31 +0000 |
| commit | ef80e4308a8960d1965e539dc60e1505133ca677 (patch) | |
| tree | 5fb893ce5eb4c3482562615f5fb8015ab59c405a /ash/shell | |
| parent | 5bb6f3c52b5946eaadb989734864a202c4e4ce8d (diff) | |
| download | chromium_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')
| -rw-r--r-- | ash/shell/context_menu.cc | 2 | ||||
| -rw-r--r-- | ash/shell/context_menu.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell/context_menu.cc b/ash/shell/context_menu.cc index 700563c..9cd5f26 100644 --- a/ash/shell/context_menu.cc +++ b/ash/shell/context_menu.cc @@ -6,8 +6,8 @@ #include "ash/launcher/launcher.h" #include "ash/root_window_controller.h" +#include "ash/shelf_types.h" #include "ash/shell.h" -#include "ash/wm/shelf_types.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/shell/context_menu.h b/ash/shell/context_menu.h index d98820e0..fc83c17 100644 --- a/ash/shell/context_menu.h +++ b/ash/shell/context_menu.h @@ -6,7 +6,7 @@ #define ASH_WM_SHELL_CONTEXT_MENU_H_ #include "ash/launcher/launcher_alignment_menu.h" -#include "ash/wm/shelf_types.h" +#include "ash/shelf_types.h" #include "base/basictypes.h" #include "ui/base/models/simple_menu_model.h" |