ash: Rename shelf_auto_hide_behavior.h to shelf_types.

NOTE: This was a TODO for sky@.

R=sky@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10676014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144520 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 20 insertions, 22 deletions

diff --git a/ash/ash.gyp b/ash/ash.gyp
index 3559d51..65537af 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -259,9 +259,9 @@
         'wm/shadow_controller.h',
         'wm/shadow_types.cc',
         'wm/shadow_types.h',
-        'wm/shelf_auto_hide_behavior.h',
         'wm/shelf_layout_manager.cc',
         'wm/shelf_layout_manager.h',
+        'wm/shelf_types.h',
         'wm/slow_animation_event_filter.cc',
         'wm/slow_animation_event_filter.h',
         'wm/stacking_controller.cc',
diff --git a/ash/launcher/launcher.h b/ash/launcher/launcher.h
index 9af34bb..890ea36 100644
--- a/ash/launcher/launcher.h
+++ b/ash/launcher/launcher.h
@@ -9,7 +9,7 @@
 #include "ash/ash_export.h"
 #include "ash/launcher/background_animator.h"
 #include "ash/launcher/launcher_types.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/size.h"
diff --git a/ash/launcher/launcher_alignment_menu.cc b/ash/launcher/launcher_alignment_menu.cc
index 39226b5..5bdaee4 100644
--- a/ash/launcher/launcher_alignment_menu.cc
+++ b/ash/launcher/launcher_alignment_menu.cc
@@ -5,7 +5,7 @@
 #include "ash/launcher/launcher_alignment_menu.h"
 
 #include "ash/shell.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/ash/launcher/launcher_button_host.h b/ash/launcher/launcher_button_host.h
index 96dd087..7945e15 100644
--- a/ash/launcher/launcher_button_host.h
+++ b/ash/launcher/launcher_button_host.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "ash/ash_export.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "base/string16.h"
 
 namespace views {
diff --git a/ash/launcher/launcher_context_menu.cc b/ash/launcher/launcher_context_menu.cc
index cb92a3b..0b307dc 100644
--- a/ash/launcher/launcher_context_menu.cc
+++ b/ash/launcher/launcher_context_menu.cc
@@ -6,7 +6,7 @@
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/ash/launcher/launcher_context_menu.h b/ash/launcher/launcher_context_menu.h
index 768e775..3440005 100644
--- a/ash/launcher/launcher_context_menu.h
+++ b/ash/launcher/launcher_context_menu.h
@@ -8,7 +8,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/launcher/launcher_alignment_menu.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
 #include "ui/base/models/simple_menu_model.h"
 
diff --git a/ash/launcher/launcher_tooltip_manager.h b/ash/launcher/launcher_tooltip_manager.h
index 2aec1ad..5451ccf 100644
--- a/ash/launcher/launcher_tooltip_manager.h
+++ b/ash/launcher/launcher_tooltip_manager.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "ash/ash_export.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "ui/gfx/rect.h"
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index 0935ccc..1db7a6b 100644
--- a/ash/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -11,7 +11,7 @@
 
 #include "ash/launcher/launcher_button_host.h"
 #include "ash/launcher/launcher_model_observer.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "base/observer_list.h"
 #include "ui/views/animation/bounds_animator_observer.h"
 #include "ui/views/context_menu_controller.h"
diff --git a/ash/shell.h b/ash/shell.h
index 107913b..be0a59c 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -11,7 +11,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/user/login_status.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h
index 93393da..8348d37 100644
--- a/ash/system/status_area_widget.h
+++ b/ash/system/status_area_widget.h
@@ -9,7 +9,7 @@
 #include "ash/ash_export.h"
 #include "ash/launcher/background_animator.h"
 #include "ash/system/user/login_status.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
diff --git a/ash/system/status_area_widget_delegate.h b/ash/system/status_area_widget_delegate.h
index 25b5b40..1d1be68 100644
--- a/ash/system/status_area_widget_delegate.h
+++ b/ash/system/status_area_widget_delegate.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "ash/ash_export.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/widget/widget_delegate.h"
diff --git a/ash/system/tray/system_tray_bubble.h b/ash/system/tray/system_tray_bubble.h
index ea854bf..542d87f 100644
--- a/ash/system/tray/system_tray_bubble.h
+++ b/ash/system/tray/system_tray_bubble.h
@@ -8,7 +8,7 @@
 
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/user/login_status.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "base/base_export.h"
 #include "base/timer.h"
 #include "ui/views/widget/widget.h"
diff --git a/ash/system/tray/system_tray_item.h b/ash/system/tray/system_tray_item.h
index e2c0b0e..39e750f0 100644
--- a/ash/system/tray/system_tray_item.h
+++ b/ash/system/tray/system_tray_item.h
@@ -8,7 +8,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/user/login_status.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
index df6a91a..5c4c2fa 100644
--- a/ash/system/tray/tray_background_view.h
+++ b/ash/system/tray/tray_background_view.h
@@ -9,7 +9,7 @@
 #include "ash/ash_export.h"
 #include "ash/launcher/background_animator.h"
 #include "ash/system/tray/tray_views.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 
 namespace ash {
 namespace internal {
diff --git a/ash/system/tray/tray_item_view.cc b/ash/system/tray/tray_item_view.cc
index 17165a8..052d91d 100644
--- a/ash/system/tray/tray_item_view.cc
+++ b/ash/system/tray/tray_item_view.cc
@@ -6,7 +6,7 @@
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/controls/image_view.h"
diff --git a/ash/wm/shelf_layout_manager.h b/ash/wm/shelf_layout_manager.h
index 8767325..dac537a 100644
--- a/ash/wm/shelf_layout_manager.h
+++ b/ash/wm/shelf_layout_manager.h
@@ -9,7 +9,7 @@
 #include "ash/ash_export.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell_observer.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/timer.h"
diff --git a/ash/wm/shelf_auto_hide_behavior.h b/ash/wm/shelf_types.h
index 85ee9c0..f5f0ac1 100644
--- a/ash/wm/shelf_auto_hide_behavior.h
+++ b/ash/wm/shelf_types.h
@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_SHELF_AUTO_HIDE_BEHAVIOR_H_
-#define ASH_WM_SHELF_AUTO_HIDE_BEHAVIOR_H_
+#ifndef ASH_WM_SHELF_TYPES_H_
+#define ASH_WM_SHELF_TYPES_H_
 #pragma once
 
-// TODO(sky): rename this file to shelf_types.
-
 namespace ash {
 
 enum ShelfAlignment {
@@ -29,4 +27,4 @@ enum ShelfAutoHideBehavior {
 
 }  // namespace ash
 
-#endif  // ASH_WM_SHELF_AUTO_HIDE_BEHAVIOR_H_
+#endif  // ASH_WM_SHELF_TYPES_H_
diff --git a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h
index 6e32049..0934582 100644
--- a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h
@@ -13,7 +13,7 @@
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model_observer.h"
 #include "ash/launcher/launcher_types.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
+#include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"