| Index: ash/system/palette/palette_tool_manager.cc
|
| diff --git a/ash/system/palette/palette_tool_manager.cc b/ash/system/palette/palette_tool_manager.cc
|
| index 88670a165a3f140f7a5d7cb4b23cfd976ce00a8d..76cdc7896ccec237a9a7cffdcd9ce7cf8baee6c1 100644
|
| --- a/ash/system/palette/palette_tool_manager.cc
|
| +++ b/ash/system/palette/palette_tool_manager.cc
|
| @@ -128,7 +128,7 @@ void PaletteToolManager::HidePaletteImmediately() {
|
| delegate_->HidePaletteImmediately();
|
| }
|
|
|
| -WmWindow* PaletteToolManager::GetWindow() {
|
| +aura::Window* PaletteToolManager::GetWindow() {
|
| return delegate_->GetWindow();
|
| }
|
|
|
|
|