summaryrefslogtreecommitdiffstats
path: root/ash/shell/window_watcher_shelf_item_delegate.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-03 23:51:27 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-03 23:51:27 +0000
commiteec097142c4b7d09ff01a03e2e2117f290d68cfc (patch)
treee31de7ef3985e92eabbfb65ed10dac797c0ba0b6 /ash/shell/window_watcher_shelf_item_delegate.h
parent3b3af9753ec5dd2796df0555900515bb8ba0c613 (diff)
downloadchromium_src-eec097142c4b7d09ff01a03e2e2117f290d68cfc.zip
chromium_src-eec097142c4b7d09ff01a03e2e2117f290d68cfc.tar.gz
chromium_src-eec097142c4b7d09ff01a03e2e2117f290d68cfc.tar.bz2
Renames LauncherID, LauncherItem and LauncherItems...
to ShelfID, ShelfItem and ShelfItems. BUG=248353 TEST=None R=jamescook@chromium.org,harrym@chromium.org Review URL: https://codereview.chromium.org/152223002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/window_watcher_shelf_item_delegate.h')
-rw-r--r--ash/shell/window_watcher_shelf_item_delegate.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell/window_watcher_shelf_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h
index a77698c..44542f6 100644
--- a/ash/shell/window_watcher_shelf_item_delegate.h
+++ b/ash/shell/window_watcher_shelf_item_delegate.h
@@ -5,8 +5,8 @@
#ifndef ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
#define ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
-#include "ash/launcher/launcher_types.h"
#include "ash/shelf/shelf_item_delegate.h"
+#include "ash/shelf/shelf_item_types.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
@@ -18,7 +18,7 @@ class WindowWatcher;
// ShelfItemDelegate implementation used by WindowWatcher.
class WindowWatcherShelfItemDelegate : public ShelfItemDelegate {
public:
- WindowWatcherShelfItemDelegate(LauncherID id, WindowWatcher* watcher);
+ WindowWatcherShelfItemDelegate(ShelfID id, WindowWatcher* watcher);
virtual ~WindowWatcherShelfItemDelegate();
// ShelfItemDelegate:
@@ -31,7 +31,7 @@ class WindowWatcherShelfItemDelegate : public ShelfItemDelegate {
virtual void Close() OVERRIDE;
private:
- LauncherID id_;
+ ShelfID id_;
WindowWatcher* watcher_;
DISALLOW_COPY_AND_ASSIGN(WindowWatcherShelfItemDelegate);