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

Unified Diff: ash/shell.h

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes 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/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 339c68c0200a7ff8dd3ac7b084a01466e066bc26..4b8ab2172437b729ff2d7785b681306f19ab44b7 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -84,8 +84,6 @@ class DesktopBackgroundController;
class DisplayController;
class FirstRunHelper;
class HighContrastController;
-class Launcher;
-class ShelfDelegate;
class LockStateController;
class MagnificationController;
class MediaDelegate;
@@ -97,6 +95,8 @@ class PowerButtonController;
class RootWindowHostFactory;
class ScreenAsh;
class SessionStateDelegate;
+class Shelf;
+class ShelfDelegate;
class ShelfItemDelegateManager;
class ShelfModel;
class ShellDelegate;
@@ -284,15 +284,15 @@ class ASH_EXPORT Shell
// unlocked.
void OnLockStateChanged(bool locked);
- // Initializes |launcher_|. Does nothing if it's already initialized.
- void CreateLauncher();
+ // Initializes |shelf_|. Does nothing if it's already initialized.
+ void CreateShelf();
// Creates virtual keyboard. Deletes the old virtual keyboard if it's already
// exist.
void CreateKeyboard();
// Show shelf view if it was created hidden (before session has started).
- void ShowLauncher();
+ void ShowShelf();
// Adds/removes observer.
void AddShellObserver(ShellObserver* observer);
« no previous file with comments | « ash/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698