| 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 17600d3063c8aa2fba826548fa018bc23c5675ec..035ac7da2a28addf70503927b321aa6a4505dcfa 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| @@ -24,7 +24,7 @@ class GURL;
|
| class LauncherItemController;
|
|
|
| namespace ash {
|
| -class Shelf;
|
| +class WmShelf;
|
| }
|
|
|
| namespace content {
|
| @@ -234,7 +234,7 @@ class ChromeLauncherController {
|
| // shelf cannot be performed here, this is only a probability used for
|
| // animation predictions.
|
| virtual bool ShelfBoundsChangesProbablyWithUser(
|
| - ash::Shelf* shelf,
|
| + ash::WmShelf* shelf,
|
| const AccountId& account_id) const = 0;
|
|
|
| // Called when the user profile is fully loaded and ready to switch to.
|
|
|