| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| index 639ce4d4f516f9ed1fad366104bdbe7df5370acd..fc0eadb3b8ada5f52018a8a1b1ab215b18988192 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| @@ -75,8 +75,8 @@ typedef ScopedVector<ChromeLauncherAppMenuItem> ChromeLauncherAppMenuItems;
|
| // ChromeLauncherController manages the launcher items needed for content
|
| // windows. Launcher items have a type, an optional app id, and a controller.
|
| // This incarnation groups running tabs/windows in application specific lists.
|
| -// * Browser app windows have BrowserLauncherItemController, owned by the
|
| -// BrowserView instance.
|
| +// * Browser app windows have BrowserShortcutLauncherItemController, owned by
|
| +// the BrowserView instance.
|
| // * App windows have AppWindowLauncherItemController, owned by
|
| // AppWindowLauncherController.
|
| // * Shortcuts have no LauncherItemController.
|
| @@ -217,8 +217,6 @@ class ChromeLauncherController
|
| // id of the app.
|
| void PersistPinnedState();
|
|
|
| - ash::ShelfModel* model();
|
| -
|
| // Accessor to the currently loaded profile. Note that in multi profile use
|
| // cases this might change over time.
|
| Profile* profile();
|
|
|