Index: ash/test/test_shelf_item_delegate.cc |
diff --git a/ash/test/test_launcher_item_delegate.cc b/ash/test/test_shelf_item_delegate.cc |
similarity index 48% |
rename from ash/test/test_launcher_item_delegate.cc |
rename to ash/test/test_shelf_item_delegate.cc |
index 3913c6841c1f5b3ee2d1f2eb7d247b04c4e1e8fe..b09d9d79d44460d3cee9983c11d0fe4c705191b4 100644 |
--- a/ash/test/test_launcher_item_delegate.cc |
+++ b/ash/test/test_shelf_item_delegate.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "ash/test/test_launcher_item_delegate.h" |
+#include "ash/test/test_shelf_item_delegate.h" |
#include "ash/wm/window_util.h" |
#include "ui/aura/window.h" |
@@ -10,42 +10,41 @@ |
namespace ash { |
namespace test { |
-TestLauncherItemDelegate::TestLauncherItemDelegate(aura::Window* window) |
+TestShelfItemDelegate::TestShelfItemDelegate(aura::Window* window) |
: window_(window) { |
} |
-TestLauncherItemDelegate::~TestLauncherItemDelegate() { |
+TestShelfItemDelegate::~TestShelfItemDelegate() { |
} |
-bool TestLauncherItemDelegate::ItemSelected(const ui::Event& event) { |
+bool TestShelfItemDelegate::ItemSelected(const ui::Event& event) { |
if (window_) { |
if (window_->type() == aura::client::WINDOW_TYPE_PANEL) |
- ash::wm::MoveWindowToEventRoot(window_, event); |
+ wm::MoveWindowToEventRoot(window_, event); |
window_->Show(); |
- ash::wm::ActivateWindow(window_); |
+ wm::ActivateWindow(window_); |
} |
return false; |
} |
-base::string16 TestLauncherItemDelegate::GetTitle() { |
+base::string16 TestShelfItemDelegate::GetTitle() { |
return window_ ? window_->title() : base::string16(); |
} |
-ui::MenuModel* TestLauncherItemDelegate::CreateContextMenu( |
+ui::MenuModel* TestShelfItemDelegate::CreateContextMenu( |
aura::Window* root_window) { |
return NULL; |
} |
-ash::LauncherMenuModel* TestLauncherItemDelegate::CreateApplicationMenu( |
- int event_flags) { |
+ShelfMenuModel* TestShelfItemDelegate::CreateApplicationMenu(int event_flags) { |
return NULL; |
} |
-bool TestLauncherItemDelegate::IsDraggable() { |
+bool TestShelfItemDelegate::IsDraggable() { |
return true; |
} |
-bool TestLauncherItemDelegate::ShouldShowTooltip() { |
+bool TestShelfItemDelegate::ShouldShowTooltip() { |
return true; |
} |