| Index: ash/system/palette/palette_tray.h
|
| diff --git a/ash/system/palette/palette_tray.h b/ash/system/palette/palette_tray.h
|
| index 4509e1c0b591accdfea4e1585695d82a744a1984..5683eae7599626b233a33ec1fb28fcd68f32efef 100644
|
| --- a/ash/system/palette/palette_tray.h
|
| +++ b/ash/system/palette/palette_tray.h
|
| @@ -93,7 +93,7 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,
|
|
|
| // PaletteToolManager::Delegate:
|
| void OnActiveToolChanged() override;
|
| - WmWindow* GetWindow() override;
|
| + aura::Window* GetWindow() override;
|
|
|
| // Updates the tray icon from the palette tool manager.
|
| void UpdateTrayIcon();
|
|
|