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
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 77a096c..7911f893 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -11,6 +11,7 @@
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/focus_cycler.h"
+#include "ash/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
@@ -25,7 +26,6 @@
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/shelf_layout_manager.h"
-#include "ash/wm/shelf_types.h"
 #include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/system_background_controller.h"
 #include "ash/wm/system_modal_container_layout_manager.h"