diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 02:08:28 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 02:08:28 +0000 |
| commit | eda3b635325c340cd64c332413d302171cabd96e (patch) | |
| tree | 288614042e2fc48274c49431b5e3339c93976673 /ash/test | |
| parent | 7591f6595f5fc3048be7941034191977aa6c3fbc (diff) | |
| download | chromium_src-eda3b635325c340cd64c332413d302171cabd96e.zip chromium_src-eda3b635325c340cd64c332413d302171cabd96e.tar.gz chromium_src-eda3b635325c340cd64c332413d302171cabd96e.tar.bz2 | |
ash: Move LauncherItemType and LauncherItemStatus over shelf_item_types.h
And also rename them to ShelfItem*
BUG=248353
TEST=None, no functional changes
R=jamescook@chromium.org,harrym@chromium.org
Review URL: https://codereview.chromium.org/143123004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246212 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/shelf_view_test_api.cc | 4 | ||||
| -rw-r--r-- | ash/test/shelf_view_test_api.h | 4 | ||||
| -rw-r--r-- | ash/test/test_shelf_delegate.cc | 2 | ||||
| -rw-r--r-- | ash/test/test_shelf_delegate.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ash/test/shelf_view_test_api.cc b/ash/test/shelf_view_test_api.cc index d40f900..2147ada 100644 --- a/ash/test/shelf_view_test_api.cc +++ b/ash/test/shelf_view_test_api.cc @@ -115,8 +115,8 @@ int ShelfViewTestAPI::GetButtonSpacing() { return shelf_view_->GetButtonSpacing(); } -bool ShelfViewTestAPI::SameDragType(LauncherItemType typea, - LauncherItemType typeb) const { +bool ShelfViewTestAPI::SameDragType(ShelfItemType typea, + ShelfItemType typeb) const { return shelf_view_->SameDragType(typea, typeb); } diff --git a/ash/test/shelf_view_test_api.h b/ash/test/shelf_view_test_api.h index 71d8f74..cff21f4 100644 --- a/ash/test/shelf_view_test_api.h +++ b/ash/test/shelf_view_test_api.h @@ -5,7 +5,7 @@ #ifndef ASH_TEST_SHELF_VIEW_TEST_API_H_ #define ASH_TEST_SHELF_VIEW_TEST_API_H_ -#include "ash/launcher/launcher_types.h" +#include "ash/shelf/shelf_item_types.h" #include "base/basictypes.h" namespace gfx { @@ -75,7 +75,7 @@ class ShelfViewTestAPI { int GetButtonSpacing(); // Wrapper for ShelfView::SameDragType. - bool SameDragType(LauncherItemType typea, LauncherItemType typeb) const; + bool SameDragType(ShelfItemType typea, ShelfItemType typeb) const; // Sets ShelfDelegate. void SetShelfDelegate(ShelfDelegate* delegate); diff --git a/ash/test/test_shelf_delegate.cc b/ash/test/test_shelf_delegate.cc index 97623ca..1f46e68 100644 --- a/ash/test/test_shelf_delegate.cc +++ b/ash/test/test_shelf_delegate.cc @@ -34,7 +34,7 @@ void TestShelfDelegate::AddLauncherItem(aura::Window* window) { } void TestShelfDelegate::AddLauncherItem(aura::Window* window, - LauncherItemStatus status) { + ShelfItemStatus status) { LauncherItem item; if (window->type() == ui::wm::WINDOW_TYPE_PANEL) item.type = TYPE_APP_PANEL; diff --git a/ash/test/test_shelf_delegate.h b/ash/test/test_shelf_delegate.h index 263d1aa..0500156 100644 --- a/ash/test/test_shelf_delegate.h +++ b/ash/test/test_shelf_delegate.h @@ -26,7 +26,7 @@ class TestShelfDelegate : public ShelfDelegate, public aura::WindowObserver { virtual ~TestShelfDelegate(); void AddLauncherItem(aura::Window* window); - void AddLauncherItem(aura::Window* window, LauncherItemStatus status); + void AddLauncherItem(aura::Window* window, ShelfItemStatus status); void RemoveLauncherItemForWindow(aura::Window* window); static TestShelfDelegate* instance() { return instance_; } |