summaryrefslogtreecommitdiffstats
path: root/ash/launcher/launcher.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-30 04:07:02 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-30 04:07:02 +0000
commit33c27919dbef6edb04d8875b2ec4e3bca66f417a (patch)
treefebefa95de5ccdf6d6dd0dc0ab85adf09227772c /ash/launcher/launcher.h
parenta4687623482006b61c4720e0b67a21889fb9da69 (diff)
downloadchromium_src-33c27919dbef6edb04d8875b2ec4e3bca66f417a.zip
chromium_src-33c27919dbef6edb04d8875b2ec4e3bca66f417a.tar.gz
chromium_src-33c27919dbef6edb04d8875b2ec4e3bca66f417a.tar.bz2
ash: Rename LauncherIconObserver to ShelfIconObserver.
And moves from launcher/ to shelf/ directory. BUG=248353 TEST=None, no behavior changes. R=harrym@chromium.org,jamescook@chromium.org Review URL: https://codereview.chromium.org/45973003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/launcher.h')
-rw-r--r--ash/launcher/launcher.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/launcher/launcher.h b/ash/launcher/launcher.h
index 693f137..5c663b4 100644
--- a/ash/launcher/launcher.h
+++ b/ash/launcher/launcher.h
@@ -41,9 +41,9 @@ namespace test {
class LauncherTestAPI;
}
-class LauncherIconObserver;
class LauncherDelegate;
class LauncherModel;
+class ShelfIconObserver;
class ShelfWidget;
class ASH_EXPORT Launcher {
@@ -82,8 +82,8 @@ class ASH_EXPORT Launcher {
// Cycles the window focus linearly over the current launcher items.
void CycleWindowLinear(CycleDirection direction);
- void AddIconObserver(LauncherIconObserver* observer);
- void RemoveIconObserver(LauncherIconObserver* observer);
+ void AddIconObserver(ShelfIconObserver* observer);
+ void RemoveIconObserver(ShelfIconObserver* observer);
// Returns true if the Launcher is showing a context menu.
bool IsShowingMenu() const;