diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 19:35:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 19:35:31 +0000 |
| commit | 812d3d4e24ab035ab65eb5c564158a991ebbe5f4 (patch) | |
| tree | 33261600b799543f921b8d36a53ff625fa1b105f /ash/system | |
| parent | c4291b771e5091f35de8487682601b5fcd688b8f (diff) | |
| download | chromium_src-812d3d4e24ab035ab65eb5c564158a991ebbe5f4.zip chromium_src-812d3d4e24ab035ab65eb5c564158a991ebbe5f4.tar.gz chromium_src-812d3d4e24ab035ab65eb5c564158a991ebbe5f4.tar.bz2 | |
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
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/status_area_widget.h | 2 | ||||
| -rw-r--r-- | ash/system/status_area_widget_delegate.h | 2 | ||||
| -rw-r--r-- | ash/system/tray/system_tray_bubble.h | 2 | ||||
| -rw-r--r-- | ash/system/tray/system_tray_item.h | 2 | ||||
| -rw-r--r-- | ash/system/tray/tray_background_view.h | 2 | ||||
| -rw-r--r-- | ash/system/tray/tray_item_view.cc | 2 |
6 files changed, 6 insertions, 6 deletions
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" |