Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: ash/test/test_shelf_item_delegate.h

Issue 97173003: ash: Rename more Launcher classes to Shelf*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: link chrome Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/test/test_launcher_item_delegate.cc ('k') | ash/test/test_shelf_item_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shelf_item_delegate.h
diff --git a/ash/test/test_launcher_item_delegate.h b/ash/test/test_shelf_item_delegate.h
similarity index 46%
rename from ash/test/test_launcher_item_delegate.h
rename to ash/test/test_shelf_item_delegate.h
index a2f631044f7839bbbcd9d59c64d99d37fdd4d2c9..af8a26ade0851f358f2f9685181097140fbc09bc 100644
--- a/ash/test/test_launcher_item_delegate.h
+++ b/ash/test/test_shelf_item_delegate.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_TEST_TEST_LAUNCHER_ITEM_DELEGATE_
-#define ASH_TEST_TEST_LAUNCHER_ITEM_DELEGATE_
+#ifndef ASH_TEST_TEST_SHELF_ITEM_DELEGATE_H_
+#define ASH_TEST_TEST_SHELF_ITEM_DELEGATE_H_
-#include "ash/launcher/launcher_item_delegate.h"
+#include "ash/shelf/shelf_item_delegate.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
@@ -16,29 +16,27 @@ class Window;
namespace ash {
namespace test {
-// Test implementation of ash::LauncherItemDelegate.
-class TestLauncherItemDelegate : public ash::LauncherItemDelegate {
+// Test implementation of ShelfItemDelegate.
+class TestShelfItemDelegate : public ShelfItemDelegate {
public:
- explicit TestLauncherItemDelegate(aura::Window* window);
- virtual ~TestLauncherItemDelegate();
+ explicit TestShelfItemDelegate(aura::Window* window);
+ virtual ~TestShelfItemDelegate();
- // ash::LauncherItemDelegate overrides:
+ // ShelfItemDelegate:
virtual bool ItemSelected(const ui::Event& event) OVERRIDE;
virtual base::string16 GetTitle() OVERRIDE;
- virtual ui::MenuModel* CreateContextMenu(
- aura::Window* root_window) OVERRIDE;
- virtual ash::LauncherMenuModel* CreateApplicationMenu(
- int event_flags) OVERRIDE;
+ virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE;
+ virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
virtual bool IsDraggable() OVERRIDE;
virtual bool ShouldShowTooltip() OVERRIDE;
private:
aura::Window* window_;
- DISALLOW_COPY_AND_ASSIGN(TestLauncherItemDelegate);
+ DISALLOW_COPY_AND_ASSIGN(TestShelfItemDelegate);
};
} // namespace test
} // namespace ash
-#endif // ASH_TEST_TEST_LAUNCHER_ITEM_DELEGATE_
+#endif // ASH_TEST_TEST_SHELF_ITEM_DELEGATE_H_
« no previous file with comments | « ash/test/test_launcher_item_delegate.cc ('k') | ash/test/test_shelf_item_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698